From 582170949818ce7cb4009e8cb1ffca93c839cabf Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Fri, 24 Nov 2017 00:31:28 -0600 Subject: [PATCH] Mechanically update c style foo(void) --- alan.cc | 16 ++++++++-------- an1.cc | 16 ++++++++-------- bcr.cc | 10 +++++----- brauniger_iq.cc | 4 ++-- bushnell.cc | 8 ++++---- bushnell_trl.cc | 8 ++++---- cet_util.cc | 8 ++++---- cst.cc | 4 ++-- delgpl.cc | 8 ++++---- destinator.cc | 24 ++++++++++++------------ dg-100.cc | 4 ++-- dmtlog.cc | 12 ++++++------ easygps.cc | 8 ++++---- energympro.cc | 8 ++++---- enigma.cc | 8 ++++---- exif.cc | 14 +++++++------- f90g_track.cc | 4 ++-- filter_vecs.cc | 6 +++--- garmin.cc | 26 +++++++++++++------------- garmin_fit.cc | 14 +++++++------- garmin_gpi.cc | 12 ++++++------ garmin_xt.cc | 8 ++++---- gdb.cc | 18 +++++++++--------- geo.cc | 8 ++++---- geojson.cc | 6 +++--- ggv_bin.cc | 4 ++-- ggv_log.cc | 8 ++++---- ggv_ovl.cc | 12 ++++++------ globalsat_sport.cc | 16 ++++++++-------- glogbook.cc | 8 ++++---- gnav_trl.cc | 8 ++++---- googledir.cc | 4 ++-- gopal.cc | 10 +++++----- gpssim.cc | 4 ++-- gpsutil.cc | 8 ++++---- gpx.cc | 21 ++++++++++----------- gtm.cc | 8 ++++---- gtrnctr.cc | 10 +++++----- hiketech.cc | 8 ++++---- holux.cc | 8 ++++---- html.cc | 4 ++-- humminbird.cc | 10 +++++----- igc.cc | 14 +++++++------- ignrando.cc | 8 ++++---- igo8.cc | 8 ++++---- ik3d.cc | 6 +++--- inifile.cc | 2 +- itracku.cc | 16 ++++++++-------- jogmap.cc | 4 ++-- jtr.cc | 8 ++++---- kml.cc | 18 +++++++++--------- lmx.cc | 8 ++++---- lowranceusr.cc | 14 +++++++------- lowranceusr4.cc | 22 +++++++++++----------- maggeo.cc | 8 ++++---- magproto.cc | 16 ++++++++-------- main.cc | 2 +- mapasia.cc | 8 ++++---- mapbar_track.cc | 8 ++++---- mapfactor.cc | 8 ++++---- mapsend.cc | 14 +++++++------- mapsource.cc | 8 ++++---- mmo.cc | 14 +++++++------- mtk_locus.cc | 24 ++++++++++++------------ mtk_logger.cc | 20 ++++++++++---------- mynav.cc | 4 ++-- navicache.cc | 8 ++++---- naviguide.cc | 18 +++++++++--------- navilink.cc | 20 ++++++++++---------- navitel.cc | 8 ++++---- netstumbler.cc | 8 ++++---- nmea.cc | 12 ++++++------ nmn4.cc | 12 ++++++------ osm.cc | 14 +++++++------- ozi.cc | 10 +++++----- pcx.cc | 8 ++++---- pocketfms_bc.cc | 10 +++++----- pocketfms_fp.cc | 4 ++-- pocketfms_wp.cc | 8 ++++---- psitrex.cc | 8 ++++---- random.cc | 4 ++-- raymarine.cc | 10 +++++----- route.cc | 22 +++++++++++----------- saroute.cc | 4 ++-- sbn.cc | 6 +++--- sbp.cc | 8 ++++---- session.cc | 6 +++--- skyforce.cc | 8 ++++---- skytraq.cc | 26 +++++++++++++------------- smplrout.cc | 4 ++-- subrip.cc | 4 ++-- tef_xml.cc | 4 ++-- teletype.cc | 6 +++--- text.cc | 4 ++-- tiger.cc | 8 ++++---- tmpro.cc | 8 ++++---- tomtom.cc | 8 ++++---- tools/cvslog | 1 - tpg.cc | 10 +++++----- tpo.cc | 26 +++++++++++++------------- unicsv.cc | 8 ++++---- util.cc | 2 +- v900.cc | 4 ++-- vcf.cc | 4 ++-- vecs.cc | 6 +++--- vidaone.cc | 8 ++++---- vitosmt.cc | 8 ++++---- vitovtt.cc | 4 ++-- vpl.cc | 4 ++-- waypt.cc | 6 +++--- wbt-200.cc | 12 ++++++------ wfff_xml.cc | 4 ++-- wintec_tes.cc | 4 ++-- xmlgeneric.cc | 4 ++-- xol.cc | 8 ++++---- yahoo.cc | 4 ++-- 116 files changed, 544 insertions(+), 546 deletions(-) delete mode 100644 tools/cvslog diff --git a/alan.cc b/alan.cc index 046e93259..a23a23295 100644 --- a/alan.cc +++ b/alan.cc @@ -195,7 +195,7 @@ static arglist_t trl_args[] = { /**************************************************************************/ // FIXME: Why is this code doing its own byte order conversion? -static unsigned int byte_order(void) +static unsigned int byte_order() { unsigned long test = BYTEORDER_TEST; unsigned char* ptr; @@ -527,7 +527,7 @@ static Waypoint* get_wpt(struct wprdata* wprdata, unsigned n) return WP; } -static void wpr_read(void) +static void wpr_read() { struct wprdata wprdata; struct rtehdr* rtehdr; @@ -589,7 +589,7 @@ static void wpr_read(void) } } -static void trl_read(void) +static void trl_read() { struct trldata trldata; struct trkhdr* trkhdr; @@ -790,7 +790,7 @@ static void wpr_route_trl(const route_head* RT) /* should we do some final sanity checks? */ } -static void wpr_write(void) +static void wpr_write() { int i; @@ -901,7 +901,7 @@ static void trl_track_tlr(const route_head* TL) TRL.loghdr.num = -1; } -static void trl_write(void) +static void trl_write() { struct trkhdr* trkhdr; void* buf; @@ -964,7 +964,7 @@ static void alan_rd_init(const QString& fname) fin = gbfopen(fname, "rb", MYNAME); } -static void alan_rd_deinit(void) +static void alan_rd_deinit() { gbfclose(fin); fin = NULL; @@ -976,14 +976,14 @@ static void alan_wr_init(const QString& fname) fout = gbfopen(fname, "wb", MYNAME); } -static void alan_wr_deinit(void) +static void alan_wr_deinit() { gbfclose(fout); fout = NULL; } -static void alan_exit(void) +static void alan_exit() { return; } diff --git a/an1.cc b/an1.cc index 2d4893b96..b52ddfbc5 100644 --- a/an1.cc +++ b/an1.cc @@ -1036,7 +1036,7 @@ static void Write_AN1_Lines(gbfile* f) } static void -Init_Wpt_Type(void) +Init_Wpt_Type() { if (!opt_wpt_type || !opt_wpt_type[0]) { wpt_type_num = 1; /* marker */ @@ -1066,7 +1066,7 @@ Init_Wpt_Type(void) } static void -Init_Output_Type(void) +Init_Output_Type() { if (!output_type || !output_type[0]) { output_type_num = last_read_type; @@ -1127,7 +1127,7 @@ Parse_Change_Type(char* type) } static void -Free_Road_Changes(void) +Free_Road_Changes() { int i = 0; if (roadchanges) { @@ -1141,7 +1141,7 @@ Free_Road_Changes(void) } static void -Init_Road_Changes(void) +Init_Road_Changes() { int count = 0; char* strType = NULL; @@ -1196,13 +1196,13 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(infile); } static void -my_read(void) +my_read() { Read_AN1_Header(infile); Read_AN1_Bitmaps(infile); @@ -1231,14 +1231,14 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { Free_Road_Changes(); gbfclose(outfile); } static void -my_write(void) +my_write() { Write_AN1_Header(outfile); Write_AN1_Bitmaps(outfile); diff --git a/bcr.cc b/bcr.cc index c4644a19c..8cf79e6b8 100644 --- a/bcr.cc +++ b/bcr.cc @@ -173,7 +173,7 @@ get_bcr_icon_from_icon_descr(const QString& icon_descr) } static void -bcr_init_radius(void) +bcr_init_radius() { if (radius_opt != NULL) { /* preinitialize the earth radius */ radius = atof(radius_opt); @@ -200,7 +200,7 @@ bcr_rd_init(const QString& fname) } static void -bcr_rd_deinit(void) +bcr_rd_deinit() { inifile_done(ini); } @@ -252,7 +252,7 @@ bcr_mercator_to_wgs84(const int north, const int east, double* lat, double* lon) /* ------------------------------------------------------------- */ static void -bcr_data_read(void) +bcr_data_read() { int index; char* str; @@ -341,7 +341,7 @@ bcr_wr_init(const QString& fname) } static void -bcr_wr_deinit(void) +bcr_wr_deinit() { gbfclose(fout); } @@ -494,7 +494,7 @@ bcr_route_header(const route_head* route) } static void -bcr_data_write(void) +bcr_data_write() { target_rte_num = 1; diff --git a/brauniger_iq.cc b/brauniger_iq.cc index e31448a1a..049b52f81 100644 --- a/brauniger_iq.cc +++ b/brauniger_iq.cc @@ -66,7 +66,7 @@ static void rd_init(const QString& fname) } } -static void rd_deinit(void) +static void rd_deinit() { gbser_deinit(serial_handle); serial_handle = NULL; @@ -225,7 +225,7 @@ static int process_data(const unsigned char* data) return remaining; } -static void data_read(void) +static void data_read() { unsigned char ibuf[25]; int rd_cnt; diff --git a/bushnell.cc b/bushnell.cc index f44b7fde7..a2ce803c5 100644 --- a/bushnell.cc +++ b/bushnell.cc @@ -163,7 +163,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -189,7 +189,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { mkshort_del_handle(&mkshort_handle); ofname.clear(); @@ -199,7 +199,7 @@ wr_deinit(void) * Each file contains a single waypoint. */ static void -bushnell_read(void) +bushnell_read() { int32_t lat_tmp,lon_tmp; unsigned int proximity; @@ -252,7 +252,7 @@ bushnell_write_one(const Waypoint* wpt) } static void -bushnell_write(void) +bushnell_write() { waypt_disp_all(bushnell_write_one); } diff --git a/bushnell_trl.cc b/bushnell_trl.cc index 7430e802b..cb32441af 100644 --- a/bushnell_trl.cc +++ b/bushnell_trl.cc @@ -47,7 +47,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -75,7 +75,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { int i = trkpt_count; while (i < 4502) { @@ -94,7 +94,7 @@ wr_deinit(void) * Each file contains a single waypoint. */ static void -bushnell_read(void) +bushnell_read() { int lat_tmp,lon_tmp; @@ -131,7 +131,7 @@ bushnell_write_one(const Waypoint* wpt) } static void -bushnell_write(void) +bushnell_write() { track_disp_all(NULL, NULL, bushnell_write_one); } diff --git a/cet_util.cc b/cet_util.cc index bda80b871..b73c925dc 100644 --- a/cet_util.cc +++ b/cet_util.cc @@ -123,7 +123,7 @@ cet_cs_vec_t cet_cs_vec_utf8 = { }; void -cet_register(void) +cet_register() { int i, c; @@ -243,7 +243,7 @@ cet_find_cs_by_name(const QString& name) } void -cet_deregister(void) +cet_deregister() { int i; int j = cet_cs_alias_ct; @@ -291,7 +291,7 @@ cet_validate_cs(const QString& cs, cet_cs_vec_t** vec, QString* cs_name) } void -cet_convert_deinit(void) +cet_convert_deinit() { global_opts.charset = NULL; global_opts.codec = NULL; @@ -332,7 +332,7 @@ cet_flag_route(const route_head* rte) } static void -cet_flag_all(void) +cet_flag_all() { waypt_disp_all(cet_flag_waypt); route_disp_all(cet_flag_route, NULL, cet_flag_waypt); diff --git a/cst.cc b/cst.cc index cfb4373aa..c040355fb 100644 --- a/cst.cc +++ b/cst.cc @@ -143,7 +143,7 @@ cst_rd_init(const QString& fname) } static void -cst_rd_deinit(void) +cst_rd_deinit() { gbfclose(fin); } @@ -151,7 +151,7 @@ cst_rd_deinit(void) /* --------------------------------------------------------------------------- */ static void -cst_data_read(void) +cst_data_read() { char* buff; int line = 0; diff --git a/delgpl.cc b/delgpl.cc index 4607691e1..02d2e5ae6 100644 --- a/delgpl.cc +++ b/delgpl.cc @@ -49,7 +49,7 @@ gpl_rd_init(const QString& fname) } static void -gpl_read(void) +gpl_read() { Waypoint* wpt_tmp; route_head* track_head; @@ -101,7 +101,7 @@ gpl_read(void) static void -gpl_rd_deinit(void) +gpl_rd_deinit() { gbfclose(gplfile_in); } @@ -113,7 +113,7 @@ gpl_wr_init(const QString& fname) } static void -gpl_wr_deinit(void) +gpl_wr_deinit() { gbfclose(gplfile_out); } @@ -157,7 +157,7 @@ gpl_trackpt(const Waypoint* wpt) } static void -gpl_write(void) +gpl_write() { track_disp_all(NULL, NULL, gpl_trackpt); } diff --git a/destinator.cc b/destinator.cc index 07c6b2f56..b89c2acb6 100644 --- a/destinator.cc +++ b/destinator.cc @@ -146,7 +146,7 @@ read_until_wcstr(const char* str) } static void -destinator_read_poi(void) +destinator_read_poi() { Waypoint* wpt; int count = 0; @@ -222,7 +222,7 @@ destinator_read_poi(void) } static void -destinator_read_rte(void) +destinator_read_rte() { int count = 0; route_head* rte = NULL; @@ -274,7 +274,7 @@ destinator_read_rte(void) } static void -destinator_read_trk(void) +destinator_read_trk() { char TXT[4] = "TXT"; int recno = -1; @@ -341,7 +341,7 @@ destinator_read_trk(void) } static void -destinator_read(void) +destinator_read() { int i0, i1; double d0, d1; @@ -487,27 +487,27 @@ destinator_rd_init(const QString& fname) } static void -destinator_rd_deinit(void) +destinator_rd_deinit() { gbfclose(fin); } static void -destinator_read_poi_wrapper(void) +destinator_read_poi_wrapper() { data_type = wptdata; destinator_read(); } static void -destinator_read_rte_wrapper(void) +destinator_read_rte_wrapper() { data_type = rtedata; destinator_read(); } static void -destinator_read_trk_wrapper(void) +destinator_read_trk_wrapper() { data_type = trkdata; destinator_read(); @@ -520,25 +520,25 @@ destinator_wr_init(const QString& fname) } static void -destinator_wr_deinit(void) +destinator_wr_deinit() { gbfclose(fout); } static void -destinator_write_poi(void) +destinator_write_poi() { waypt_disp_all(destinator_wpt_disp); } static void -destinator_write_rte(void) +destinator_write_rte() { route_disp_all(NULL, NULL, destinator_rtept_disp); } static void -destinator_write_trk(void) +destinator_write_trk() { track_disp_all(NULL, NULL, destinator_trkpt_disp); } diff --git a/dg-100.cc b/dg-100.cc index 238ffaf4e..a50b6eb86 100644 --- a/dg-100.cc +++ b/dg-100.cc @@ -740,14 +740,14 @@ dg200_rd_init(const QString& fname) } static void -dg100_rd_deinit(void) +dg100_rd_deinit() { gbser_deinit(serial_handle); serial_handle = NULL; } static void -dg100_read(void) +dg100_read() { if (*erase_only == '1') { dg100_erase(); diff --git a/dmtlog.cc b/dmtlog.cc index f535a5a11..fe5b6cd3c 100644 --- a/dmtlog.cc +++ b/dmtlog.cc @@ -632,7 +632,7 @@ inflate_buff(const char* buff, const size_t size, char** out_buff) static void -read_CXMLSafe(void) +read_CXMLSafe() { char* xmlstr = NULL; @@ -658,7 +658,7 @@ read_CXMLSafe(void) #endif static void -read_XML(void) +read_XML() { xml_init(fin->name, tlog3b_xgcb_map, NULL); xml_read(); @@ -683,13 +683,13 @@ dmtlog_rd_init(const QString& fname) } static void -dmtlog_rd_deinit(void) +dmtlog_rd_deinit() { gbfclose(fin); } static void -dmtlog_read(void) +dmtlog_read() { switch (gbfgetuint32(fin)) { @@ -724,7 +724,7 @@ dmtlog_wr_init(const QString& fname) } static void -dmtlog_wr_deinit(void) +dmtlog_wr_deinit() { gbfclose(fout); } @@ -814,7 +814,7 @@ wpt_cb(const Waypoint* wpt) } static void -dmtlog_write(void) +dmtlog_write() { track_index = atoi(opt_index); /* ... validate index */ diff --git a/easygps.cc b/easygps.cc index 6b641024d..82f650eb9 100644 --- a/easygps.cc +++ b/easygps.cc @@ -55,7 +55,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -68,14 +68,14 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); } static void -data_read(void) +data_read() { char p; char ibuf[10]; @@ -192,7 +192,7 @@ ez_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { setshort_length(mkshort_handle, 6); diff --git a/energympro.cc b/energympro.cc index b2c53eaf3..ae95de69a 100644 --- a/energympro.cc +++ b/energympro.cc @@ -186,7 +186,7 @@ read_point(route_head* gpsbabel_route,gpsbabel::DateTime& gpsDateTime) static void -read_lap(void) +read_lap() { tw_lap lap; gbfread(&lap,sizeof(tw_lap),1,file_in); @@ -224,7 +224,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { if (global_opts.debug_level > 1) { printf (MYNAME " rd_deinit()\n"); @@ -233,7 +233,7 @@ rd_deinit(void) } static void -track_read(void) +track_read() { if(global_opts.debug_level > 1) { printf (MYNAME " waypoint_read()\n"); @@ -287,7 +287,7 @@ track_read(void) } static void -data_read(void) +data_read() { if (global_opts.debug_level > 1) { printf (MYNAME " data_read()\n"); diff --git a/enigma.cc b/enigma.cc index 8799a47b4..c6c00c919 100644 --- a/enigma.cc +++ b/enigma.cc @@ -101,7 +101,7 @@ float enigmaPositionToDec(int32_t val) } static void -data_read(void) +data_read() { struct enigma_wpt ewpt; route_head* route = route_head_alloc(); @@ -148,7 +148,7 @@ data_read(void) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -191,13 +191,13 @@ enigma_waypt_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { route_disp_all(NULL, NULL, enigma_waypt_disp); } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } diff --git a/exif.cc b/exif.cc index b6d73ca61..6b67a912e 100644 --- a/exif.cc +++ b/exif.cc @@ -325,7 +325,7 @@ exif_release_ifd(exif_ifd_t* ifd) } static void -exif_release_apps(void) +exif_release_apps() { queue* e0, *t0; @@ -369,7 +369,7 @@ exif_ifd_size(exif_ifd_t* ifd) } static exif_app_t* -exif_load_apps(void) +exif_load_apps() { exif_app_t* exif_app = NULL; @@ -1242,7 +1242,7 @@ exif_write_ifd(const exif_ifd_t* ifd, const char next, gbfile* fout) } static void -exif_write_apps(void) +exif_write_apps() { queue* e0, *t0; @@ -1348,14 +1348,14 @@ exif_rd_init(const QString& fname) } static void -exif_rd_deinit(void) +exif_rd_deinit() { exif_release_apps(); gbfclose(fin); } static void -exif_read(void) +exif_read() { uint16_t soi; Waypoint* wpt; @@ -1404,7 +1404,7 @@ exif_wr_init(const QString& fname) } static void -exif_wr_deinit(void) +exif_wr_deinit() { exif_release_apps(); @@ -1424,7 +1424,7 @@ exif_wr_deinit(void) } static void -exif_write(void) +exif_write() { time_t frame; diff --git a/f90g_track.cc b/f90g_track.cc index 134347fc0..fa3ac0404 100644 --- a/f90g_track.cc +++ b/f90g_track.cc @@ -76,7 +76,7 @@ f90g_track_rd_init(const QString& fname) } static void -f90g_track_rd_deinit(void) +f90g_track_rd_deinit() { gbfclose(fin); } @@ -86,7 +86,7 @@ static const double MIN_PER_DEGREE = 600000.0f; static const float SPEED_CONVERSION = (10.0f)/(36.0f); // convert KPH to meters per second static void -f90g_track_read(void) +f90g_track_read() { Waypoint* readWaypoint; char northSouth, eastWest, velocityMark, ttRec[TTRECORDSIZE], tempBuf[20]; diff --git a/filter_vecs.cc b/filter_vecs.cc index 325c35fa6..9b14ca941 100644 --- a/filter_vecs.cc +++ b/filter_vecs.cc @@ -246,7 +246,7 @@ free_filter_vec(filter_vecs_t* fvec) } void -init_filter_vecs(void) +init_filter_vecs() { fl_vecs_t* vec = filter_vec_list; while (vec->vec) { @@ -261,7 +261,7 @@ init_filter_vecs(void) } void -exit_filter_vecs(void) +exit_filter_vecs() { fl_vecs_t* vec = filter_vec_list; while (vec->vec) { @@ -277,7 +277,7 @@ exit_filter_vecs(void) * parse for help on available command line options. */ void -disp_filter_vecs(void) +disp_filter_vecs() { fl_vecs_t* vec; arglist_t* ap; diff --git a/garmin.cc b/garmin.cc index 8639d775d..a4bcb8779 100644 --- a/garmin.cc +++ b/garmin.cc @@ -341,7 +341,7 @@ rd_init(const QString& fname) } static void -rw_deinit(void) +rw_deinit() { if (gps_baud_rate != DEFAULT_BAUD) { if (0 == GPS_Set_Baud_Rate(portname, DEFAULT_BAUD)) { @@ -370,7 +370,7 @@ waypt_read_cb(int total_ct, GPS_PWay* ) } static void -waypt_read(void) +waypt_read() { int i,n; GPS_PWay* way = NULL; @@ -472,7 +472,7 @@ unsigned int checkWayPointIsAtSplit(Waypoint* wpt, GPS_PLap* laps, int nlaps) static void -track_read(void) +track_read() { int32 ntracks; GPS_PTrack* array; @@ -560,7 +560,7 @@ track_read(void) static void -route_read(void) +route_read() { int32 nroutepts; int i; @@ -817,7 +817,7 @@ pvt_read(posn_status* posn_status) } static void -data_read(void) +data_read() { if (gpx_vec) { gpx_vec->read(); @@ -844,7 +844,7 @@ data_read(void) } static GPS_PWay -sane_GPS_Way_New(void) +sane_GPS_Way_New() { GPS_PWay way; way = GPS_Way_New(); @@ -918,7 +918,7 @@ get_gc_info(Waypoint* wpt) } static int -waypoint_prepare(void) +waypoint_prepare() { int i; int n = waypt_count(); @@ -1039,7 +1039,7 @@ waypoint_prepare(void) } static void -waypoint_write(void) +waypoint_write() { int i, n; int32 ret; @@ -1134,7 +1134,7 @@ route_noop(const route_head* ) } static void -route_write(void) +route_write() { int i; int n = 2 * route_waypt_count(); /* Doubled for the islink crap. */ @@ -1180,7 +1180,7 @@ track_waypt_pr(const Waypoint* wpt) } static int -track_prepare(void) +track_prepare() { int i; int32 n = track_waypt_count() + track_count(); @@ -1199,7 +1199,7 @@ track_prepare(void) } static void -track_write(void) +track_write() { int i, n; @@ -1213,7 +1213,7 @@ track_write(void) } static void -course_write(void) +course_write() { int i, n_trk, n_wpt; @@ -1235,7 +1235,7 @@ course_write(void) } static void -data_write(void) +data_write() { if (poweroff) { return; diff --git a/garmin_fit.cc b/garmin_fit.cc index 61ee47d0f..b3d8c027e 100644 --- a/garmin_fit.cc +++ b/garmin_fit.cc @@ -106,7 +106,7 @@ fit_rd_init(const QString& fname) } static void -fit_rd_deinit(void) +fit_rd_deinit() { int local_id; @@ -126,7 +126,7 @@ fit_rd_deinit(void) * fit_parse_header- parse the global FIT header *******************************************************************************/ static void -fit_parse_header(void) +fit_parse_header() { int len; int ver; @@ -173,7 +173,7 @@ fit_parse_header(void) } static uint8_t -fit_getuint8(void) +fit_getuint8() { int val; @@ -196,7 +196,7 @@ fit_getuint8(void) } static uint16_t -fit_getuint16(void) +fit_getuint16() { char buf[2]; @@ -215,7 +215,7 @@ fit_getuint16(void) } static uint32_t -fit_getuint32(void) +fit_getuint32() { char buf[4]; @@ -626,7 +626,7 @@ fit_parse_compressed_message(uint8_t header) * fit_parse_record- parse each record in the file *******************************************************************************/ static void -fit_parse_record(void) +fit_parse_record() { uint8_t header; @@ -662,7 +662,7 @@ fit_parse_record(void) * - parse all the records in the file *******************************************************************************/ static void -fit_read(void) +fit_read() { fit_parse_header(); diff --git a/garmin_gpi.cc b/garmin_gpi.cc index 98093dc79..149c7f7da 100644 --- a/garmin_gpi.cc +++ b/garmin_gpi.cc @@ -299,7 +299,7 @@ gpi_read_string(const char* field) } static void -read_header(void) +read_header() { int len, i; #ifdef GPI_DBG @@ -1212,7 +1212,7 @@ write_category(const char* category, const unsigned char* image, const int image static void -write_header(void) +write_header() { time_t time = gpi_timestamp; @@ -1531,7 +1531,7 @@ garmin_gpi_wr_init(const QString& fname) static void -garmin_gpi_rd_deinit(void) +garmin_gpi_rd_deinit() { delete rdata; gbfclose(fin); @@ -1539,7 +1539,7 @@ garmin_gpi_rd_deinit(void) static void -garmin_gpi_wr_deinit(void) +garmin_gpi_wr_deinit() { wdata_free(wdata); mkshort_del_handle(&short_h); @@ -1559,7 +1559,7 @@ garmin_gpi_wr_deinit(void) static void -garmin_gpi_read(void) +garmin_gpi_read() { while (1) { int tag = gbfgetint32(fin); @@ -1574,7 +1574,7 @@ garmin_gpi_read(void) static void -garmin_gpi_write(void) +garmin_gpi_write() { unsigned char* image; int image_sz; diff --git a/garmin_xt.cc b/garmin_xt.cc index b91e98e2e..604a5c60f 100644 --- a/garmin_xt.cc +++ b/garmin_xt.cc @@ -78,7 +78,7 @@ format_garmin_xt_rd_init(const QString& fname) } static void -format_garmin_xt_rd_deinit(void) +format_garmin_xt_rd_deinit() { gbfclose(fin); } @@ -231,7 +231,7 @@ format_garmin_xt_decomp_last_ele(uint8_t ii, double* PrevEle, uint8_t TrackBlock * Main Function to process Saved tracks file */ static void -format_garmin_xt_proc_strk(void) +format_garmin_xt_proc_strk() { int Count = 0; // Used to obtain number of read bytes int NumberOfTracks = 0, TracksCompleted = 0; // Number of tracks in the file and number of processed tracks @@ -336,7 +336,7 @@ format_garmin_xt_proc_strk(void) } static void -format_garmin_xt_proc_atrk(void) +format_garmin_xt_proc_atrk() { uint16_t block=0, uu=0; uint32_t Lat=0, Lon=0; @@ -404,7 +404,7 @@ format_garmin_xt_proc_atrk(void) } static void -format_garmin_xt_read(void) +format_garmin_xt_read() { // Saved Tracks file if (strcmp(opt_xt_ftype, "STRK") == 0) { diff --git a/gdb.cc b/gdb.cc index 7060c6387..344d516a3 100644 --- a/gdb.cc +++ b/gdb.cc @@ -262,7 +262,7 @@ gdb_fread_str(char* buf, int size, gbfile* fin) } static QString -gdb_fread_strlist(void) +gdb_fread_strlist() { // char* res = NULL; QString res; @@ -426,7 +426,7 @@ gdb_write_time(const int time) /*-----------------------------------------------------------------------------*/ static void -read_file_header(void) +read_file_header() { char buf[128]; int i, reclen; @@ -726,7 +726,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out) /*-----------------------------------------------------------------------------*/ static route_head* -read_route(void) +read_route() { route_head* rte; int points, warnings, links, i; @@ -942,7 +942,7 @@ read_route(void) /*-----------------------------------------------------------------------------*/ static route_head* -read_track(void) +read_track() { route_head* res; int points, index; @@ -1032,7 +1032,7 @@ gdb_rd_init(const QString& fname) } static void -gdb_rd_deinit(void) +gdb_rd_deinit() { disp_summary(fin); gdb_flush_waypt_queue(&wayptq_in); @@ -1042,7 +1042,7 @@ gdb_rd_deinit(void) } static void -read_data(void) +read_data() { gbfile* fsave; int incomplete = 0; /* number of incomplete reads */ @@ -1174,7 +1174,7 @@ reset_short_handle(const char* defname) /* ----------------------------------------------------------------------------*/ static void -write_header(void) +write_header() { char buff[128], tbuff[32]; char* c; @@ -1807,7 +1807,7 @@ gdb_wr_init(const QString& fname) } static void -gdb_wr_deinit(void) +gdb_wr_deinit() { disp_summary(fout); gdb_flush_waypt_queue(&wayptq_out); @@ -1817,7 +1817,7 @@ gdb_wr_deinit(void) } static void -write_data(void) +write_data() { if (gdb_opt_ver) { gdb_ver = atoi(gdb_opt_ver); diff --git a/geo.cc b/geo.cc index e6f4560a0..32dad5cd3 100644 --- a/geo.cc +++ b/geo.cc @@ -101,7 +101,7 @@ geo_rd_init(const QString& fname) } static void -geo_read(void) +geo_read() { gpsbabel::File file(geo_read_fname); file.open(QIODevice::ReadOnly); @@ -151,7 +151,7 @@ geocache_container wpt_container(const QString& args) } static void -geo_rd_deinit(void) +geo_rd_deinit() { } @@ -168,7 +168,7 @@ geo_wr_init(const QString& fname) } static void -geo_wr_deinit(void) +geo_wr_deinit() { writer.writeEndDocument(); gbfputs(ostring,ofd); @@ -244,7 +244,7 @@ geo_waypt_pr(const Waypoint* waypointp) } static void -geo_write(void) +geo_write() { writer.writeStartElement("loc"); writer.writeAttribute("version", "1.0"); diff --git a/geojson.cc b/geojson.cc index 20c05ea93..e206459fb 100644 --- a/geojson.cc +++ b/geojson.cc @@ -113,7 +113,7 @@ geojson_rd_deinit() { } static void -geojson_wr_deinit(void) { +geojson_wr_deinit() { QJsonObject object; object[TYPE] = FEATURE_COLLECTION; object[FEATURES] = *feature_collection; @@ -159,7 +159,7 @@ routes_from_polygon_coordinates(const QJsonArray& polygon) } static void -geojson_read(void) { +geojson_read() { QFile file; file.setFileName(input_file_name); file.open(QIODevice::ReadOnly | QIODevice::Text); @@ -306,7 +306,7 @@ static void geojson_track_tlr(const route_head* track) { } static void -geojson_write(void) { +geojson_write() { waypt_disp_all(geojson_waypt_pr); track_disp_all(geojson_track_hdr, geojson_track_tlr, geojson_track_disp); } diff --git a/ggv_bin.cc b/ggv_bin.cc index 6c87e2dc3..d3412de7c 100644 --- a/ggv_bin.cc +++ b/ggv_bin.cc @@ -479,13 +479,13 @@ ggv_bin_read_init(const QString& fname) } static void -ggv_bin_read_deinit(void) +ggv_bin_read_deinit() { read_fname.clear(); } static void -ggv_bin_read(void) +ggv_bin_read() { QFile file(read_fname); diff --git a/ggv_log.cc b/ggv_log.cc index c026bee54..72f5f81ab 100644 --- a/ggv_log.cc +++ b/ggv_log.cc @@ -84,13 +84,13 @@ ggv_log_rd_init(const QString& fname) } static void -ggv_log_rd_deinit(void) +ggv_log_rd_deinit() { gbfclose(fin); } static void -ggv_log_read(void) +ggv_log_read() { signed char* buf; int bufsz = 0, len; @@ -198,7 +198,7 @@ ggv_log_wr_init(const QString& fname) } static void -ggv_log_wr_deinit(void) +ggv_log_wr_deinit() { gbfclose(fout); } @@ -265,7 +265,7 @@ ggv_log_track_head_cb(const route_head* trk) } static void -ggv_log_write(void) +ggv_log_write() { track_disp_all(ggv_log_track_head_cb, NULL, NULL); } diff --git a/ggv_ovl.cc b/ggv_ovl.cc index ae7c22bf6..2393fa46a 100644 --- a/ggv_ovl.cc +++ b/ggv_ovl.cc @@ -92,13 +92,13 @@ ggv_ovl_rd_init(const QString& fname) } static void -ggv_ovl_rd_deinit(void) +ggv_ovl_rd_deinit() { inifile_done(inifile); } static void -ggv_ovl_read(void) +ggv_ovl_read() { int symbols; int i; @@ -206,7 +206,7 @@ ggv_ovl_read(void) static void waypt_disp_cb(const Waypoint* wpt); static void track_disp_cb(const route_head* trk); static void route_disp_cb(const route_head* rte); -static void write_bounds(void); +static void write_bounds(); static void draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, const OVL_COLOR_TYP color, const Waypoint* wpt); static int get_direction(const Waypoint* A, const Waypoint* B); // static void draw_symbol_text(const char *text, const waypoint *reference); @@ -222,13 +222,13 @@ ggv_ovl_wr_init(const QString& fname) } static void -ggv_ovl_wr_deinit(void) +ggv_ovl_wr_deinit() { gbfclose(fout); } static void -ggv_ovl_write(void) +ggv_ovl_write() { group_ct = 1; /* tracks are not grouped */ color = OVL_COLOR_FUCHSIA; @@ -349,7 +349,7 @@ waypt_bound_calc(const Waypoint* waypointp) } static void -write_bounds(void) +write_bounds() { waypt_init_bounds(&all_bounds); diff --git a/globalsat_sport.cc b/globalsat_sport.cc index 43cd8b2d1..6fae7d640 100644 --- a/globalsat_sport.cc +++ b/globalsat_sport.cc @@ -208,7 +208,7 @@ serial_init(const char* fname) } static void -serial_deinit(void) +serial_deinit() { if (global_opts.debug_level > 1) { printf(MYNAME " serial_deinit()\n"); @@ -443,7 +443,7 @@ wr_init(const QString& fname) static void -rd_deinit(void) +rd_deinit() { if (global_opts.debug_level > 1) { printf(MYNAME " rd_deinit()\n"); @@ -465,7 +465,7 @@ rd_deinit(void) } static void -wr_deinit(void) +wr_deinit() { if (global_opts.debug_level > 1) { printf(MYNAME " wr_deinit()\n"); @@ -473,11 +473,11 @@ wr_deinit(void) serial_deinit(); } -static void track_read(void); +static void track_read(); static void -waypoint_read(void) +waypoint_read() { if (global_opts.debug_level > 1) { printf(MYNAME " waypoint_read()\n"); @@ -501,7 +501,7 @@ waypoint_read(void) } static void -track_read(void) +track_read() { if (global_opts.debug_level > 1) { printf(MYNAME " track_read()\n"); @@ -814,7 +814,7 @@ track_read(void) } static void -route_read(void) +route_read() { if (global_opts.debug_level > 1) { printf(MYNAME " route_read() TODO\n"); @@ -822,7 +822,7 @@ route_read(void) } static void -data_read(void) +data_read() { if (global_opts.debug_level > 1) { printf(MYNAME " data_read()\n"); diff --git a/glogbook.cc b/glogbook.cc index 2ab3de478..1407a8f8c 100644 --- a/glogbook.cc +++ b/glogbook.cc @@ -67,13 +67,13 @@ glogbook_rd_init(const QString& fname) } static void -glogbook_read(void) +glogbook_read() { xml_read(); } static void -glogbook_rd_deinit(void) +glogbook_rd_deinit() { xml_deinit(); } @@ -88,7 +88,7 @@ glogbook_wr_init(const QString& fname) } static void -glogbook_wr_deinit(void) +glogbook_wr_deinit() { writer.writeEndDocument(); gbfputs(ostring,ofd); @@ -124,7 +124,7 @@ glogbook_ftr(const route_head* rte) } static void -glogbook_write(void) +glogbook_write() { #if 0 gbfprintf(ofd, "\n"); diff --git a/gnav_trl.cc b/gnav_trl.cc index efbdc2fd7..0020c847c 100644 --- a/gnav_trl.cc +++ b/gnav_trl.cc @@ -55,13 +55,13 @@ gnav_trl_rw_init(const QString& fname) } static void -gnav_trl_rd_deinit(void) +gnav_trl_rd_deinit() { gbfclose(fin); } static void -gnav_trl_rw_deinit(void) +gnav_trl_rw_deinit() { gbfclose(fout); } @@ -85,7 +85,7 @@ write_altitude(void* ptr, const float alt) } static void -gnav_trl_read(void) +gnav_trl_read() { route_head* trk = NULL; @@ -130,7 +130,7 @@ gnav_trl_write_trkpt(const Waypoint* wpt) } static void -gnav_trl_write(void) +gnav_trl_write() { track_disp_all(NULL, NULL, gnav_trl_write_trkpt); } diff --git a/googledir.cc b/googledir.cc index 3058958c4..65257938b 100644 --- a/googledir.cc +++ b/googledir.cc @@ -140,7 +140,7 @@ google_rd_init(const QString& fname) } static void -google_read(void) +google_read() { xml_read(); @@ -149,7 +149,7 @@ google_read(void) } static void -google_rd_deinit(void) +google_rd_deinit() { xml_deinit(); mkshort_del_handle(&desc_handle); diff --git a/gopal.cc b/gopal.cc index 95ee92bbd..59c136dee 100644 --- a/gopal.cc +++ b/gopal.cc @@ -158,13 +158,13 @@ gopal_rd_init(const QString& fname) } static void -gopal_rd_deinit(void) +gopal_rd_deinit() { gbfclose(fin); } static void -gopal_read(void) +gopal_read() { char* buff; @@ -381,19 +381,19 @@ gopal_wr_init(const QString& fname) } static void -gopal_wr_deinit(void) +gopal_wr_deinit() { gbfclose(fout); } static void -gopal_write(void) +gopal_write() { route_disp_all(gopal_route_hdr, gopal_route_tlr, gopal_write_waypt); } static void -gopal_exit(void) /* optional */ +gopal_exit() /* optional */ { } diff --git a/gpssim.cc b/gpssim.cc index ef3b64e9d..22bd88b97 100644 --- a/gpssim.cc +++ b/gpssim.cc @@ -73,7 +73,7 @@ gpssim_wr_init(const QString& fname) } static void -gpssim_wr_deinit(void) +gpssim_wr_deinit() { if (fout) { gbfclose(fout); @@ -165,7 +165,7 @@ gpssim_trk_ftr(const route_head* rh) } static void -gpssim_write(void) +gpssim_write() { if (waypt_count()) { if (splitfiles) { diff --git a/gpsutil.cc b/gpsutil.cc index a43609d2c..546f100dd 100644 --- a/gpsutil.cc +++ b/gpsutil.cc @@ -39,7 +39,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -52,14 +52,14 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); } static void -data_read(void) +data_read() { char* ibuf; char desc[31]; @@ -168,7 +168,7 @@ gpsutil_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { waypt_disp_all(gpsutil_disp); } diff --git a/gpx.cc b/gpx.cc index 36701e52a..642a8f3bf 100644 --- a/gpx.cc +++ b/gpx.cc @@ -246,7 +246,7 @@ static inline QString toString(float f) * this allows gpx:wpt names to overlap gpx:rtept names, etc. */ static void -gpx_reset_short_handle(void) +gpx_reset_short_handle() { if (mkshort_handle != NULL) { mkshort_del_handle(&mkshort_handle); @@ -436,7 +436,7 @@ get_tag(const QString& t, int* passthrough) } static void -prescan_tags(void) +prescan_tags() { tag_mapping* tm; for (tm = tag_path_map; tm->tag_type_ != 0; tm++) { @@ -1216,7 +1216,7 @@ gpx_rd_init(const QString& fname) static void -gpx_rd_deinit(void) +gpx_rd_deinit() { delete reader; reader = NULL; @@ -1331,7 +1331,7 @@ gpx_wr_init(const QString& fname) } static void -gpx_wr_deinit(void) +gpx_wr_deinit() { writer->writeEndDocument(); delete writer; @@ -1344,7 +1344,7 @@ gpx_wr_deinit(void) } void -gpx_read(void) +gpx_read() { for (bool atEnd = false; !reader->atEnd() && !atEnd;) { reader->readNext(); @@ -1724,8 +1724,7 @@ static void gpx_track_disp(const Waypoint* waypointp) { fs_xml* fs_gpx; - int first_in_trk; - first_in_trk = waypointp->Q.prev == ¤t_trk_head->waypoint_list; + bool first_in_trk = waypointp->Q.prev == ¤t_trk_head->waypoint_list; if (waypointp->wpt_flags.new_trkseg) { if (!first_in_trk) { @@ -1865,7 +1864,7 @@ gpx_waypt_bound_calc(const Waypoint* waypointp) } static void -gpx_write_bounds(void) +gpx_write_bounds() { waypt_init_bounds(&all_bounds); @@ -1884,7 +1883,7 @@ gpx_write_bounds(void) } static void -gpx_write(void) +gpx_write() { gpx_reset_short_handle(); @@ -1898,7 +1897,7 @@ gpx_write(void) static void -gpx_free_gpx_global(void) +gpx_free_gpx_global() { gpx_rm_from_global(&gpx_global->name); gpx_rm_from_global(&gpx_global->desc); @@ -1911,7 +1910,7 @@ gpx_free_gpx_global(void) } static void -gpx_exit(void) +gpx_exit() { gpx_version.clear(); diff --git a/gtm.cc b/gtm.cc index 99ae66e5e..e41f1fb70 100644 --- a/gtm.cc +++ b/gtm.cc @@ -431,7 +431,7 @@ gtm_rd_init(const QString& fname) } static void -gtm_rd_deinit(void) +gtm_rd_deinit() { gbfclose(file_in); } @@ -501,13 +501,13 @@ gtm_wr_init(const QString& fname) } static void -gtm_wr_deinit(void) +gtm_wr_deinit() { gbfclose(file_out); } static void -gtm_read(void) +gtm_read() { route_head* first_trk_head = NULL; route_head* trk_head = NULL; @@ -708,7 +708,7 @@ static void write_rte_waypt(const Waypoint* wpt) } static void -gtm_write(void) +gtm_write() { waypt_disp_all(write_waypt); if (waypt_count()) { diff --git a/gtrnctr.cc b/gtrnctr.cc index 14eb0d700..95acfe636 100644 --- a/gtrnctr.cc +++ b/gtrnctr.cc @@ -177,13 +177,13 @@ gtc_rd_init(const QString& fname) } static void -gtc_read(void) +gtc_read() { xml_read(); } static void -gtc_rd_deinit(void) +gtc_rd_deinit() { xml_deinit(); } @@ -207,7 +207,7 @@ gtc_wr_init(const QString& fname) } static void -gtc_wr_deinit(void) +gtc_wr_deinit() { gbfclose(ofd); } @@ -341,7 +341,7 @@ gtc_waypt_pr(const Waypoint* wpt) } static void -gtc_fake_hdr(void) +gtc_fake_hdr() { /* handle the CourseLap_t or the ActivityLap_t types. */ /* note that the elements must appear in the order required by the schema. */ @@ -452,7 +452,7 @@ gtc_crs_ftr(const route_head*) } void -gtc_write(void) +gtc_write() { gtc_write_xml(0, "\n"); gtc_write_xml(1, "\n"); diff --git a/hiketech.cc b/hiketech.cc index 1b3748661..3eba8186c 100644 --- a/hiketech.cc +++ b/hiketech.cc @@ -85,13 +85,13 @@ hiketech_rd_init(const QString& fname) } static void -hiketech_read(void) +hiketech_read() { xml_read(); } static void -hiketech_rd_deinit(void) +hiketech_rd_deinit() { xml_deinit(); } @@ -104,7 +104,7 @@ hiketech_wr_init(const QString& fname) } static void -hiketech_wr_deinit(void) +hiketech_wr_deinit() { writer.writeEndDocument(); gbfputs(ostring, ofd); @@ -176,7 +176,7 @@ hiketech_waypt_pr(const Waypoint* wpt) } static void -hiketech_write(void) +hiketech_write() { writer.writeStartElement("hiketech"); writer.writeAttribute("version", "1.2"); diff --git a/holux.cc b/holux.cc index 42252520b..12a2a4cbf 100644 --- a/holux.cc +++ b/holux.cc @@ -44,7 +44,7 @@ static void rd_init(const QString& fname) } -static void rd_deinit(void) +static void rd_deinit() { gbfclose(file_in); } @@ -67,7 +67,7 @@ wr_init(const QString& fname) -static void wr_deinit(void) +static void wr_deinit() { mkshort_del_handle(&mkshort_handle); gbfclose(file_out); @@ -75,7 +75,7 @@ static void wr_deinit(void) -static void data_read(void) +static void data_read() { char name[9], desc[90]; double lat,lon; @@ -257,7 +257,7 @@ static void holux_disp(const Waypoint* wpt) -static void data_write(void) +static void data_write() { int iWritten; short sCount; diff --git a/html.cc b/html.cc index dd24447a9..a8b9f39f8 100644 --- a/html.cc +++ b/html.cc @@ -72,7 +72,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); @@ -249,7 +249,7 @@ html_index(const Waypoint* wpt) } static void -data_write(void) +data_write() { setshort_length(mkshort_handle, 6); diff --git a/humminbird.cc b/humminbird.cc index 7159aa0e8..a2e2f1882 100644 --- a/humminbird.cc +++ b/humminbird.cc @@ -256,7 +256,7 @@ humminbird_rd_init(const QString& fname) } static void -humminbird_rd_deinit(void) +humminbird_rd_deinit() { gbfclose(fin); } @@ -611,7 +611,7 @@ humminbird_read_track_old(gbfile* fin) } static void -humminbird_read(void) +humminbird_read() { while (! gbfeof(fin)) { uint32_t signature; @@ -679,7 +679,7 @@ humminbird_wr_init(const QString& fname) } static void -humminbird_wr_deinit(void) +humminbird_wr_deinit() { mkshort_del_handle(&wptname_sh); mkshort_del_handle(&rtename_sh); @@ -879,7 +879,7 @@ humminbird_track_cb(const Waypoint* wpt) static void -humminbird_track_write(void) +humminbird_track_write() { track_disp_all(humminbird_track_head, humminbird_track_tail, humminbird_track_cb); @@ -968,7 +968,7 @@ humminbird_write_waypoint_wrapper(const Waypoint* wpt) } static void -humminbird_write(void) +humminbird_write() { waypt_disp_all(humminbird_write_waypoint_wrapper); route_disp_all(NULL, NULL, humminbird_write_waypoint_wrapper); diff --git a/igc.cc b/igc.cc index a501363c2..e443f34ac 100644 --- a/igc.cc +++ b/igc.cc @@ -131,7 +131,7 @@ static void rd_init(const QString& fname) } } -static void rd_deinit(void) +static void rd_deinit() { gbfclose(file_in); } @@ -254,7 +254,7 @@ static void igc_task_rec(const char* rec) route_add_wpt(rte_head, wpt); } -static void data_read(void) +static void data_read() { char* ibuf; igc_rec_type_t rec_type; @@ -567,7 +567,7 @@ static char* tod2str(struct tm* tod) /* * Write header records */ -static void wr_header(void) +static void wr_header() { const route_head* pres_track; const route_head* track; @@ -706,7 +706,7 @@ static void wr_task_tlr(const route_head* rte) } } -static void wr_tasks(void) +static void wr_tasks() { route_disp_all(wr_task_hdr, wr_task_tlr, wr_task_wpt); } @@ -857,7 +857,7 @@ static double interpolate_alt(const route_head* track, time_t time) * Pressure altitude and GNSS altitude may be provided in two seperate * tracks. This function attempts to merge them into one. */ -static void wr_track(void) +static void wr_track() { const route_head* pres_track; const route_head* gnss_track; @@ -915,12 +915,12 @@ static void wr_init(const QString& fname) file_out = gbfopen(fname, "wb", MYNAME); } -static void wr_deinit(void) +static void wr_deinit() { gbfclose(file_out); } -static void data_write(void) +static void data_write() { gbfputs("AXXXZZZGPSBabel\r\n", file_out); wr_header(); diff --git a/ignrando.cc b/ignrando.cc index 79e44067a..97d469a1f 100644 --- a/ignrando.cc +++ b/ignrando.cc @@ -148,13 +148,13 @@ ignr_rd_init(const QString& fname) } static void -ignr_rd_deinit(void) +ignr_rd_deinit() { xml_deinit(); } static void -ignr_read(void) +ignr_read() { xml_read(); } @@ -170,7 +170,7 @@ ignr_rw_init(const QString& fname) } static void -ignr_rw_deinit(void) +ignr_rw_deinit() { gbfclose(fout); } @@ -213,7 +213,7 @@ ignr_write_waypt(const Waypoint* wpt) } static void -ignr_write(void) +ignr_write() { time_t now; struct tm tm; diff --git a/igo8.cc b/igo8.cc index 85937e2eb..e42853882 100644 --- a/igo8.cc +++ b/igo8.cc @@ -148,7 +148,7 @@ static void igo8_read_init(const QString& fname) } // Reader callback -static void igo8_read(void) +static void igo8_read() { Waypoint* wpt_tmp; route_head* track_head; @@ -171,7 +171,7 @@ static void igo8_read(void) } // Reader close callback -static void igo8_read_deinit(void) +static void igo8_read_deinit() { gbfclose(igo8_file_in); } @@ -188,7 +188,7 @@ static void igo8_write_init(const QString& fname) } // Writer close callback -static void igo8_write_deinit(void) +static void igo8_write_deinit() { uint32_t normalized_file_size; @@ -347,7 +347,7 @@ void write_header() } // Writer callback -static void igo8_write(void) +static void igo8_write() { write_header(); track_disp_all(NULL, NULL, write_igo8_track_point); diff --git a/ik3d.cc b/ik3d.cc index 37042437d..3516d0347 100644 --- a/ik3d.cc +++ b/ik3d.cc @@ -54,7 +54,7 @@ xg_tag_mapping ikt_map[] = { }; static void -ikt_object_end(void) +ikt_object_end() { if (track) { track->rte_name = name; @@ -131,13 +131,13 @@ ikt_rd_init(const QString& fname) } static void -ikt_read(void) +ikt_read() { xml_read(); } static void -ikt_rd_deinit(void) +ikt_rd_deinit() { ikt_object_end(); xml_deinit(); diff --git a/inifile.cc b/inifile.cc index 242dd98fb..03c858f62 100644 --- a/inifile.cc +++ b/inifile.cc @@ -85,7 +85,7 @@ find_gpsbabel_inifile(const char* path) /* can be empty or NULL */ } static gbfile* -open_gpsbabel_inifile(void) +open_gpsbabel_inifile() { char* name; char* envstr; diff --git a/itracku.cc b/itracku.cc index 15dbbfbce..47b2bcf1e 100644 --- a/itracku.cc +++ b/itracku.cc @@ -458,7 +458,7 @@ itracku_rd_init(const QString& fname) } static void -itracku_rd_deinit(void) +itracku_rd_deinit() { dbg(1, "%d new waypoints", new_waypoint_count); if (fd) { @@ -586,7 +586,7 @@ itracku_waypt_input(void (*waypt_add)(Waypoint* wpt)) } static void -itracku_read_waypt(void) +itracku_read_waypt() { itracku_waypt_input(&waypt_add); } @@ -600,7 +600,7 @@ itracku_read_trk_waypt_add(Waypoint* wpt) } static void -itracku_read_trk(void) +itracku_read_trk() { itracku_read_trk_track = route_head_alloc(); track_add_head(itracku_read_trk_track); @@ -608,7 +608,7 @@ itracku_read_trk(void) } static void -itracku_read(void) +itracku_read() { switch (global_opts.objective) { case wptdata: @@ -633,7 +633,7 @@ itracku_wr_init(const QString& fname) } static void -itracku_wr_deinit(void) +itracku_wr_deinit() { gbfclose(fout); } @@ -645,13 +645,13 @@ itracku_output_waypoint(const Waypoint* wp) } static void -itracku_write(void) +itracku_write() { waypt_disp_all(itracku_output_waypoint); } static void -itracku_exit(void) /* optional */ +itracku_exit() /* optional */ { } @@ -758,7 +758,7 @@ itracku_rt_position(posn_status* posn_status) } static void -itracku_rt_deinit(void) +itracku_rt_deinit() { itracku_rd_deinit(); } diff --git a/jogmap.cc b/jogmap.cc index ef702370c..3b29cb269 100644 --- a/jogmap.cc +++ b/jogmap.cc @@ -82,13 +82,13 @@ jogmap_rd_init(const QString& fname) } static void -jogmap_read(void) +jogmap_read() { xml_read(); } static void -jogmap_rd_deinit(void) +jogmap_rd_deinit() { xml_deinit(); } diff --git a/jtr.cc b/jtr.cc index e17a3bf80..739bf309b 100644 --- a/jtr.cc +++ b/jtr.cc @@ -88,14 +88,14 @@ jtr_rd_init(const QString& fname) } static void -jtr_rd_deinit(void) +jtr_rd_deinit() { trkpts.clear(); gbfclose(fin); } static void -jtr_read(void) +jtr_read() { char* str; int line = 0; @@ -256,7 +256,7 @@ jtr_wr_init(const QString& fname) } static void -jtr_wr_deinit(void) +jtr_wr_deinit() { gbfclose(fout); } @@ -318,7 +318,7 @@ jtr_trkpt_disp_cb(const Waypoint* wpt) } static void -jtr_write(void) +jtr_write() { track_disp_all(NULL, NULL, jtr_trkpt_disp_cb); } diff --git a/kml.cc b/kml.cc index d55110c47..5954cf004 100644 --- a/kml.cc +++ b/kml.cc @@ -224,7 +224,7 @@ static void kml_init_color_sequencer(unsigned int steps_per_rev) } } -static void kml_step_color(void) +static void kml_step_color() { int color_seq; // Map kml_color_sequencer.seq to an integer in the range [0, KML_COLOR_LIMIT*6). @@ -468,13 +468,13 @@ kml_rd_init(const QString& fname) static void -kml_read(void) +kml_read() { xml_read(); } static void -kml_rd_deinit(void) +kml_rd_deinit() { xml_deinit(); } @@ -539,7 +539,7 @@ kml_wr_position_init(const QString& fname) } static void -kml_wr_deinit(void) +kml_wr_deinit() { writer->writeEndDocument(); delete writer; @@ -558,7 +558,7 @@ kml_wr_deinit(void) } static void -kml_wr_position_deinit(void) +kml_wr_position_deinit() { // kml_wr_deinit(); posnfilename.clear(); @@ -1154,7 +1154,7 @@ static const QString map_templates[] = { static -void kml_gc_make_balloonstyletext(void) +void kml_gc_make_balloonstyletext() { QString cdataStr; @@ -1226,7 +1226,7 @@ void kml_gc_make_balloonstyletext(void) } static -void kml_gc_make_balloonstyle(void) +void kml_gc_make_balloonstyle() { // For Normal style of gecoaches, scale of label is set to zero // to make the label invisible. On hover (highlight?) enlarge @@ -1869,7 +1869,7 @@ static void kml_route_tlr(const route_head* header) // For Earth 5.0 and later, we write a LookAt that encompasses // the bounding box of our entire data set and set the event times // to include all our data. -void kml_write_AbstractView(void) +void kml_write_AbstractView() { double bb_size; @@ -1940,7 +1940,7 @@ void kml_mt_array_schema(const char* field_name, const char* display_name, writer->writeEndElement(); // Close gx:SimpleArrayField tag } -void kml_write(void) +void kml_write() { const global_trait* traits = get_traits(); diff --git a/lmx.cc b/lmx.cc index b73bedee9..fd1e58fc3 100644 --- a/lmx.cc +++ b/lmx.cc @@ -61,7 +61,7 @@ lmx_wr_init(const QString& fname) } static void -lmx_wr_deinit(void) +lmx_wr_deinit() { gbfclose(ofd); } @@ -258,7 +258,7 @@ lmx_print(const Waypoint* wpt) static void -lmx_write(void) +lmx_write() { if (binary) { gbfputc(0x03, ofd); // WBXML version 1.3 @@ -322,13 +322,13 @@ lmx_rd_init(const QString& fname) } static void -lmx_read(void) +lmx_read() { xml_read(); } static void -lmx_rd_deinit(void) +lmx_rd_deinit() { xml_deinit(); } diff --git a/lowranceusr.cc b/lowranceusr.cc index 653b07ddb..3fd2c5214 100644 --- a/lowranceusr.cc +++ b/lowranceusr.cc @@ -330,7 +330,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -345,7 +345,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); @@ -447,7 +447,7 @@ lowranceusr_parse_waypt(Waypoint* wpt_tmp) static void -lowranceusr_parse_routes(void) +lowranceusr_parse_routes() { char buff[MAXUSRSTRINGSIZE + 1]; short int num_routes, num_legs; @@ -493,7 +493,7 @@ lowranceusr_parse_routes(void) * option of ignoreicons is used */ static void -lowranceusr_parse_icons(void) +lowranceusr_parse_icons() { char buff[MAXUSRSTRINGSIZE + 1]; short int num_icons; @@ -530,7 +530,7 @@ lowranceusr_parse_icons(void) } static void -lowranceusr_parse_trails(void) +lowranceusr_parse_trails() { char buff[MAXUSRSTRINGSIZE + 1]; short int num_trails, num_trail_points, num_section_points; @@ -623,7 +623,7 @@ lowranceusr_parse_trails(void) } static void -data_read(void) +data_read() { short int NumWaypoints, MajorVersion, MinorVersion, object_num; int i; @@ -1011,7 +1011,7 @@ lowranceusr_merge_track_hdr_2(const route_head* trk) } static void -data_write(void) +data_write() { short int NumWaypoints, MajorVersion, MinorVersion, NumRoutes, NumTrails, NumIcons; setshort_length(mkshort_handle, 15); diff --git a/lowranceusr4.cc b/lowranceusr4.cc index f2470453e..fb237eeee 100644 --- a/lowranceusr4.cc +++ b/lowranceusr4.cc @@ -165,7 +165,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -178,7 +178,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); @@ -268,7 +268,7 @@ lowranceusr4_free_fsdata(void* fsdata) static lowranceusr4_fsdata* -lowranceusr4_alloc_fsdata(void) +lowranceusr4_alloc_fsdata() { lowranceusr4_fsdata* fsdata = (lowranceusr4_fsdata*) xcalloc(sizeof(*fsdata), 1); fsdata->fs.type = FS_LOWRANCEUSR4; @@ -345,7 +345,7 @@ lowranceusr4_find_waypt_index(const Waypoint* wpt) static void -lowranceusr4_parse_waypoints(void) +lowranceusr4_parse_waypoints() { short int icon_num; unsigned int i, num_waypts, create_date, create_time; @@ -505,7 +505,7 @@ lowranceusr4_find_waypt(int uid_unit, int uid_seq_low, int uid_seq_high) } static void -lowranceusr4_parse_routes(void) +lowranceusr4_parse_routes() { unsigned int num_routes, i, j, text_len; unsigned int num_legs; @@ -583,7 +583,7 @@ lowranceusr4_parse_routes(void) } static void -lowranceusr4_parse_trails(void) +lowranceusr4_parse_trails() { int num_trails, num_trail_pts, M, i, j, k, trk_num, text_len; char buff[MAXUSRSTRINGSIZE + 1]; @@ -724,7 +724,7 @@ lowranceusr4_parse_trails(void) static void -data_read(void) +data_read() { short int MajorVersion, MinorVersion; int text_len, DataStreamVersion; @@ -839,7 +839,7 @@ lowranceusr4_waypt_disp(const Waypoint* wpt) } static void -lowranceusr4_write_waypoints(void) +lowranceusr4_write_waypoints() { int i; @@ -921,7 +921,7 @@ lowranceusr4_write_route_trl(const route_head* rte) } static void -lowranceusr4_write_routes(void) +lowranceusr4_write_routes() { if (global_opts.debug_level >= 1) { printf(MYNAME " writing %d routes\n", route_count()); @@ -1007,7 +1007,7 @@ lowranceusr4_write_track_waypt(const Waypoint* wpt) } static void -lowranceusr4_write_trails(void) +lowranceusr4_write_trails() { if (global_opts.debug_level >= 1) { printf(MYNAME " writing %d tracks\n", track_count()); @@ -1018,7 +1018,7 @@ lowranceusr4_write_trails(void) } static void -data_write(void) +data_write() { short int MajorVersion, MinorVersion; int DataStreamVersion; diff --git a/maggeo.cc b/maggeo.cc index 9bf92bb1b..c6d433050 100644 --- a/maggeo.cc +++ b/maggeo.cc @@ -53,7 +53,7 @@ maggeo_rd_init(const QString& fname) } static void -maggeo_rd_deinit(void) +maggeo_rd_deinit() { gbfclose(maggeofile_in); } @@ -71,7 +71,7 @@ maggeo_wr_init(const QString& fname) } static void -maggeo_wr_deinit(void) +maggeo_wr_deinit() { maggeo_writemsg("PMGNCMD,END"); mkshort_del_handle(&desc_handle); @@ -79,7 +79,7 @@ maggeo_wr_deinit(void) } static void -maggeo_read(void) +maggeo_read() { char* buff; @@ -318,7 +318,7 @@ maggeo_waypt_pr(const Waypoint* waypointp) } static void -maggeo_write(void) +maggeo_write() { waypt_disp_all(maggeo_waypt_pr); } diff --git a/magproto.cc b/magproto.cc index 0deb7f336..b0a9b26ee 100644 --- a/magproto.cc +++ b/magproto.cc @@ -47,8 +47,8 @@ static int broken_sportrak; static QString termread(char* ibuf, int size); static void termwrite(char* obuf, int size); static void mag_readmsg(gpsdata_type objective); -static void mag_handon(void); -static void mag_handoff(void); +static void mag_handon(); +static void mag_handoff(); static short_handle mkshort_handle = NULL; static char* deficon = NULL; static char* bs = NULL; @@ -360,7 +360,7 @@ mag_writeack(int osum) } static void -mag_handon(void) +mag_handon() { if (!is_file) { mag_writemsg("PMGNCMD,HANDON"); @@ -370,7 +370,7 @@ mag_handon(void) } static void -mag_handoff(void) +mag_handoff() { if (!is_file) { mag_writemsg("PMGNCMD,HANDOFF"); @@ -902,7 +902,7 @@ mag_wr_init(const QString& portname) } static void -mag_deinit(void) +mag_deinit() { if (explorist_info) { explorist_ini_done(explorist_info); @@ -922,7 +922,7 @@ mag_deinit(void) } static void -mag_wr_deinit(void) +mag_wr_deinit() { if (explorist) { mag_writemsg("PMGNCMD,END"); @@ -1263,7 +1263,7 @@ mag_wptparse(char* trkmsg) } static void -mag_read(void) +mag_read() { if (gpx_vec) { char** f = os_gpx_files(explorist_info->track_path); @@ -1577,7 +1577,7 @@ mag_route_pr() } static void -mag_write(void) +mag_write() { wptcmtcnt = 0; diff --git a/main.cc b/main.cc index 222b9cf20..fc354dc97 100644 --- a/main.cc +++ b/main.cc @@ -193,7 +193,7 @@ spec_usage(const char* vec) } static void -print_extended_info(void) +print_extended_info() { printf( diff --git a/mapasia.cc b/mapasia.cc index 8ca0ef98c..bb1a5e05e 100644 --- a/mapasia.cc +++ b/mapasia.cc @@ -67,7 +67,7 @@ tr7_rd_init(const QString& fname) } static void -tr7_read(void) +tr7_read() { route_head* trk = NULL; unsigned int magic; @@ -185,7 +185,7 @@ tr7_check_after_read_trailer_cb(const route_head* trk) } static void -tr7_rd_deinit(void) +tr7_rd_deinit() { track_disp_session(curr_session(), tr7_check_after_read_head_cb, @@ -270,13 +270,13 @@ tr7_wr_init(const QString& fname) } static void -tr7_wr_deinit(void) +tr7_wr_deinit() { gbfclose(fout); } static void -tr7_write(void) +tr7_write() { track_disp_all(tr7_disp_track_head_cb, NULL, tr7_disp_waypt_cb); } diff --git a/mapbar_track.cc b/mapbar_track.cc index 7bb249f26..8d57ecb09 100644 --- a/mapbar_track.cc +++ b/mapbar_track.cc @@ -44,13 +44,13 @@ mapbar_track_rd_init(const QString& fname) } static void -mapbar_track_rd_deinit(void) +mapbar_track_rd_deinit() { gbfclose(fin); } static gpsbabel::DateTime -read_datetime(void) +read_datetime() { int hour = gbfgetint16(fin); int min = gbfgetint16(fin); @@ -65,7 +65,7 @@ read_datetime(void) static const double DIV_RATE = 100000.0f; static Waypoint* -read_waypoint(void) +read_waypoint() { int longitude = gbfgetint32(fin); int latitude = gbfgetint32(fin); @@ -79,7 +79,7 @@ read_waypoint(void) } static void -mapbar_track_read(void) +mapbar_track_read() { route_head* track = route_head_alloc(); is_fatal((track == NULL), MYNAME ": memory non-enough"); diff --git a/mapfactor.cc b/mapfactor.cc index 6b478f450..2f5753e6b 100644 --- a/mapfactor.cc +++ b/mapfactor.cc @@ -74,7 +74,7 @@ mapfactor_rd_init(const QString& fname) } static void -mapfactor_read(void) +mapfactor_read() { gpsbabel::File file(mapfactor_read_fname); file.open(QIODevice::ReadOnly); @@ -92,7 +92,7 @@ mapfactor_read(void) static void -mapfactor_rd_deinit(void) +mapfactor_rd_deinit() { } @@ -113,7 +113,7 @@ mapfactor_wr_init(const QString& fname) } static void -mapfactor_wr_deinit(void) +mapfactor_wr_deinit() { writer->writeEndDocument(); delete writer; @@ -135,7 +135,7 @@ mapfactor_waypt_pr(const Waypoint* waypointp) } static void -mapfactor_write(void) +mapfactor_write() { writer->writeStartElement("favourites"); writer->writeAttribute("version", "1"); diff --git a/mapsend.cc b/mapsend.cc index fec6ef5c1..bf1571904 100644 --- a/mapsend.cc +++ b/mapsend.cc @@ -79,7 +79,7 @@ mapsend_rd_init(const QString& fname) } static void -mapsend_rd_deinit(void) +mapsend_rd_deinit() { gbfclose(mapsend_file_in); } @@ -99,7 +99,7 @@ mapsend_wr_init(const QString& fname) } static void -mapsend_wr_deinit(void) +mapsend_wr_deinit() { gbfclose(mapsend_file_out); mkshort_del_handle(&mkshort_handle); @@ -107,7 +107,7 @@ mapsend_wr_deinit(void) } static void -mapsend_wpt_read(void) +mapsend_wpt_read() { char tbuf[256]; int wpt_count, rte_count, rte_num; @@ -188,7 +188,7 @@ mapsend_wpt_read(void) } static void -mapsend_track_read(void) +mapsend_track_read() { unsigned int trk_count; int valid; @@ -232,7 +232,7 @@ mapsend_track_read(void) } static void -mapsend_read(void) +mapsend_read() { mapsend_hdr hdr; int type; @@ -503,13 +503,13 @@ void mapsend_track_disp(const Waypoint* wpt) } void -mapsend_track_write(void) +mapsend_track_write() { track_disp_all(mapsend_track_hdr, mapsend_noop, mapsend_track_disp); } static void -mapsend_wpt_write(void) +mapsend_wpt_write() { mapsend_hdr hdr = {13, {'4','D','5','3','3','3','3','0',' ','M','S'}, {'3', '0'}, ms_type_wpt, {0, 0, 0} diff --git a/mapsource.cc b/mapsource.cc index b1769f6bb..fc143852b 100644 --- a/mapsource.cc +++ b/mapsource.cc @@ -236,7 +236,7 @@ mps_rd_init(const QString& fname) } static void -mps_rd_deinit(void) +mps_rd_deinit() { gbfclose(mps_file_in); if (read_route_wpt_mkshort_handle) { @@ -287,7 +287,7 @@ mps_wr_init(const QString& fname) } static void -mps_wr_deinit(void) +mps_wr_deinit() { gbfclose(mps_file_out); @@ -1689,7 +1689,7 @@ mps_trackdatapoint_w_wrapper(const Waypoint* wpt) static void -mps_read(void) +mps_read() { Waypoint* wpt; route_head* rte; @@ -1813,7 +1813,7 @@ mps_read(void) } void -mps_write(void) +mps_write() { int short_length; Waypoint* wpt; diff --git a/mmo.cc b/mmo.cc index 3c0d61726..fdbf26d31 100644 --- a/mmo.cc +++ b/mmo.cc @@ -149,7 +149,7 @@ dbgprintf(const char* sobj, const char* fmt, ...) #endif static char* -mmo_readstr(void) +mmo_readstr() { char* res; signed int len; @@ -326,7 +326,7 @@ mmo_register_icon(const int id, const char* name) } -static mmo_data_t* mmo_read_object(void); +static mmo_data_t* mmo_read_object(); static void @@ -832,7 +832,7 @@ mmo_read_CObjCurrentPosition(mmo_data_t* data) static mmo_data_t* -mmo_read_object(void) +mmo_read_object() { int objid; mmo_data_t* data = NULL; @@ -1014,7 +1014,7 @@ mmo_rd_init(const QString& fname) static void -mmo_rd_deinit(void) +mmo_rd_deinit() { route_disp_session(curr_session(), NULL, NULL, mmo_finalize_rtept_cb); @@ -1030,7 +1030,7 @@ mmo_rd_deinit(void) static void -mmo_read(void) +mmo_read() { #ifdef MMO_DBG const char* sobj = "main"; @@ -1468,7 +1468,7 @@ mmo_wr_init(const QString& fname) static void -mmo_wr_deinit(void) +mmo_wr_deinit() { mmobjects.clear(); category_names.clear(); @@ -1483,7 +1483,7 @@ mmo_wr_deinit(void) static void -mmo_write(void) +mmo_write() { int i; diff --git a/mtk_locus.cc b/mtk_locus.cc index a6c430c6a..f2e4ce55e 100644 --- a/mtk_locus.cc +++ b/mtk_locus.cc @@ -61,8 +61,8 @@ arglist_t mtk_locus_args[] = { }; static void mtk_locus_rd_init(const QString& fname); -static void mtk_locus_rd_deinit(void); -static void mtk_locus_read(void); +static void mtk_locus_rd_deinit(); +static void mtk_locus_read(); ff_vecs_t mtk_locus_vecs = { ff_type_file, @@ -106,13 +106,13 @@ static int last_loxsequence; static char waiting_for[20]; -static void set_baudrate(void); -static void read_line(void); -static void process_packet(void); -static void process_pmtklox(void); -static void process_pmtklog(void); -static void process_pmtk001(void); -static void process_pmtk705(void); +static void set_baudrate(); +static void read_line(); +static void process_packet(); +static void process_pmtklox(); +static void process_pmtklog(); +static void process_pmtk001(); +static void process_pmtk705(); static void send_command(const char* s, const char* waitfor); static int calculate_checksum(const char* s, int length); static void dbg(int l, const char* msg, ...); @@ -145,7 +145,7 @@ mtk_locus_rd_init(const QString& fname) } static void -mtk_locus_rd_deinit(void) +mtk_locus_rd_deinit() { if (read_mode == rm_serial) { gbser_deinit(sfd); @@ -155,7 +155,7 @@ mtk_locus_rd_deinit(void) } static void -mtk_locus_read(void) +mtk_locus_read() { int i; @@ -260,7 +260,7 @@ set_baudrate() } void -read_line(void) +read_line() { int rc; char* s; diff --git a/mtk_logger.cc b/mtk_logger.cc index 77fe328b1..2690e700e 100644 --- a/mtk_logger.cc +++ b/mtk_logger.cc @@ -253,9 +253,9 @@ const char CMD_LOG_STATUS[] = "$PMTK182,2,7*3C\r\n"; static int mtk_log_len(unsigned int bitmask); static void mtk_rd_init(const QString& fname); static void file_init(const QString& fname); -static void file_deinit(void) ; -static void holux245_init(void); -static void file_read(void); +static void file_deinit() ; +static void holux245_init(); +static void file_read(); static int mtk_parse_info(const unsigned char* data, int dataLen); @@ -488,7 +488,7 @@ static void mtk_rd_init(const QString& fname) xfree(model); } -static void mtk_rd_deinit(void) +static void mtk_rd_deinit() { if (mtk_device == HOLUX_GR245) { int rc = do_cmd("$PHLX827*31\r\n", "PHLX860*32", NULL, 10); @@ -503,7 +503,7 @@ static void mtk_rd_deinit(void) xfree(port); } -static int mtk_erase(void) +static int mtk_erase() { int log_status, log_mask, err; char* lstatus = NULL; @@ -541,7 +541,7 @@ static int mtk_erase(void) return 0; } -static void mtk_read(void) +static void mtk_read() { char cmd[256]; char* line = NULL; @@ -987,7 +987,7 @@ static void mtk_csv_init(char* csv_fname, unsigned long bitmask) gbfprintf(cd, "\n"); } -static void mtk_csv_deinit(void) +static void mtk_csv_deinit() { if (cd != NULL) { gbfclose(cd); @@ -1490,13 +1490,13 @@ static void file_init(const QString& fname) } } -static void file_deinit(void) +static void file_deinit() { dbg(4, "Closing file...\n"); fclose(fl); } -static void holux245_init(void) +static void holux245_init() { mtk_device = HOLUX_GR245; @@ -1522,7 +1522,7 @@ static int is_holux_string(const unsigned char* data, int dataLen) return 0; } -static void file_read(void) +static void file_read() { long fsize, pos; int i, j, k, bLen; diff --git a/mynav.cc b/mynav.cc index 5ac119625..c51fe2853 100644 --- a/mynav.cc +++ b/mynav.cc @@ -131,13 +131,13 @@ mynav_rd_init(const QString& fname) } static void -mynav_rd_deinit(void) +mynav_rd_deinit() { gbfclose(fin); } static void -mynav_rd(void) +mynav_rd() { QString buff; diff --git a/navicache.cc b/navicache.cc index c40ad9722..79efe6f2f 100644 --- a/navicache.cc +++ b/navicache.cc @@ -178,7 +178,7 @@ NaviReadCache(const QXmlStreamReader& reader) } static void -nav_read(void) +nav_read() { QXmlStreamReader reader; gpsbabel::File file(read_fname); @@ -203,7 +203,7 @@ nav_read(void) } static void -nav_rd_deinit(void) +nav_rd_deinit() { } @@ -214,12 +214,12 @@ nav_wr_init(const QString& fname) } static void -nav_wr_deinit(void) +nav_wr_deinit() { } static void -nav_write(void) +nav_write() { } diff --git a/naviguide.cc b/naviguide.cc index 76f2c783f..1e59ffa7c 100644 --- a/naviguide.cc +++ b/naviguide.cc @@ -89,7 +89,7 @@ static char temp_short_name[5]; /* Forward declarations */ -static void ng_read_file_header(void); +static void ng_read_file_header(); static arglist_t ng_args[] = { @@ -193,7 +193,7 @@ ng_fread_next_wp(ng_next_wp_t* nwp, gbfile* f) /* =================== Write data functions ====================================*/ static void -ng_fill_header_default(void) +ng_fill_header_default() { ng_file_header_t default_header = { 0x00, @@ -208,7 +208,7 @@ ng_fill_header_default(void) static void -ng_fill_waypoint_default(void) +ng_fill_waypoint_default() { ng_wp_data_t default_wp = { {0xfe, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00}, @@ -273,7 +273,7 @@ ng_waypt_rd(const Waypoint* wpt) } static void -header_write(void) +header_write() { ng_file_header.nof_wp = nof_wp; gbfputint16(nof_wp, file_out); @@ -283,7 +283,7 @@ header_write(void) static void -data_write(void) +data_write() { nof_wp = waypt_count(); if (nof_wp) { @@ -312,7 +312,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } @@ -339,7 +339,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); file_in = NULL; @@ -348,7 +348,7 @@ rd_deinit(void) static void -ng_read_file_header(void) +ng_read_file_header() { nof_wp = gbfgetint16(file_in); @@ -364,7 +364,7 @@ ng_read_file_header(void) } static void -data_read(void) +data_read() { if (process_rte) { rte_head = route_head_alloc(); diff --git a/navilink.cc b/navilink.cc index bdf884a2f..7bc6023cd 100644 --- a/navilink.cc +++ b/navilink.cc @@ -270,7 +270,7 @@ write_packet(unsigned type, const void* payload, unsigned length) } static unsigned -read_word(void) +read_word() { unsigned char buffer[2]; @@ -468,7 +468,7 @@ encode_trackpoint(const Waypoint* waypt, unsigned serial, unsigned char* buffer) } static Waypoint** -serial_read_waypoints(void) +serial_read_waypoints() { Waypoint** waypts = NULL; unsigned char information[32]; @@ -547,7 +547,7 @@ serial_write_waypoint(const Waypoint* waypt) } static void -serial_read_track(void) +serial_read_track() { unsigned char information[32]; unsigned int address; @@ -594,7 +594,7 @@ serial_read_track(void) } static void -serial_write_track(void) +serial_write_track() { unsigned char information[32]; unsigned int address; @@ -933,7 +933,7 @@ read_datalog_records(route_head* track, } static void -serial_read_datalog(void) +serial_read_datalog() { route_head* track; unsigned int seg1_addr; @@ -956,7 +956,7 @@ serial_read_datalog(void) } static void -file_read(void) +file_read() { unsigned char data[32]; route_head* track = NULL; @@ -1034,7 +1034,7 @@ file_write_route_end(const route_head* track) } static void -nuke(void) +nuke() { if (nuketrk) { unsigned char information[32]; @@ -1144,7 +1144,7 @@ navilink_wr_init(const QString& name) } static void -navilink_deinit(void) +navilink_deinit() { if (serial_handle) { /* nuke data after reading */ @@ -1167,7 +1167,7 @@ navilink_deinit(void) } static void -navilink_read(void) +navilink_read() { if (datalog) { if (global_opts.masked_objective & TRKDATAMASK) { @@ -1203,7 +1203,7 @@ navilink_read(void) } static void -navilink_write(void) +navilink_write() { if (datalog) { fatal(MYNAME ": Writing to datalog not supported.\n"); diff --git a/navitel.cc b/navitel.cc index 5626ef334..be25d5389 100644 --- a/navitel.cc +++ b/navitel.cc @@ -40,13 +40,13 @@ navitel_rd_init(const QString& fname) } static void -navitel_rd_deinit(void) +navitel_rd_deinit() { gbfclose(fin); } static void -navitel_read_track(void) +navitel_read_track() { int points, i; route_head* trk = NULL; @@ -80,7 +80,7 @@ navitel_wr_init(const QString& fname) } static void -navitel_wr_deinit(void) +navitel_wr_deinit() { gbfclose(fout); } @@ -115,7 +115,7 @@ navitel_disp_trkpts(const Waypoint* wpt) } static void -navitel_write_track(void) +navitel_write_track() { trkpts = 0; track_disp_all(NULL, NULL, navitel_enum_trkpts); diff --git a/netstumbler.cc b/netstumbler.cc index aef610ce5..545d66fdc 100644 --- a/netstumbler.cc +++ b/netstumbler.cc @@ -35,7 +35,7 @@ static char* sneicon = NULL; static char* snmac = NULL; static int macstumbler; -static void fix_netstumbler_dupes(void); +static void fix_netstumbler_dupes(); #define MYNAME "NETSTUMBLER" @@ -72,13 +72,13 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } static void -data_read(void) +data_read() { char* ibuf; char ssid[2 + 32 + 2 + 1]; /* "( " + SSID + " )" + null */ @@ -290,7 +290,7 @@ compare(const void* a, const void* b) static void -fix_netstumbler_dupes(void) +fix_netstumbler_dupes() { int i, ct = waypt_count(), serial = 0; htable_t* htable, *bh; diff --git a/nmea.cc b/nmea.cc index 6d8a98a10..38b0cc652 100644 --- a/nmea.cc +++ b/nmea.cc @@ -304,7 +304,7 @@ nmea_rd_init(const QString& fname) } static void -nmea_rd_deinit(void) +nmea_rd_deinit() { switch (read_mode) { case rm_serial: @@ -356,7 +356,7 @@ nmea_wr_init(const QString& portname) } static void -nmea_wr_deinit(void) +nmea_wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); @@ -1016,7 +1016,7 @@ nmea_parse_one_line(char* ibuf) } static void -nmea_read(void) +nmea_read() { char* ibuf; char* ck; @@ -1130,7 +1130,7 @@ safe_print(int cnt, const char* b) static void reset_sirf_to_nmea(int br); static -int hunt_sirf(void) +int hunt_sirf() { /* Try to place the common BR's first to speed searching */ static int br[] = {38400, 9600, 57600, 115200, 19200, 4800, -1}; @@ -1380,7 +1380,7 @@ nmea_trackpt_pr(const Waypoint* wpt) } static void -nmea_write(void) +nmea_write() { waypt_disp_all(nmea_wayptpr); track_disp_all(nmea_track_init, NULL, nmea_trackpt_pr); @@ -1399,7 +1399,7 @@ nmea_wr_posn(Waypoint* wpt) } static void -nmea_wr_posn_deinit(void) +nmea_wr_posn_deinit() { // nmea_wr_deinit(); } diff --git a/nmn4.cc b/nmn4.cc index e466da291..63950c811 100644 --- a/nmn4.cc +++ b/nmn4.cc @@ -62,7 +62,7 @@ nmn4_check_line(char* line) } static void -nmn4_read_data(void) +nmn4_read_data() { char* buff; char* str; @@ -224,7 +224,7 @@ nmn4_write_waypt(const Waypoint* wpt) } static void -nmn4_write_data(void) +nmn4_write_data() { target_rte_num = 1; @@ -249,13 +249,13 @@ nmn4_rd_init(const QString& fname) } static void -nmn4_rd_deinit(void) +nmn4_rd_deinit() { gbfclose(fin); } static void -nmn4_read(void) +nmn4_read() { nmn4_read_data(); } @@ -267,13 +267,13 @@ nmn4_wr_init(const QString& fname) } static void -nmn4_wr_deinit(void) +nmn4_wr_deinit() { gbfclose(fout); } static void -nmn4_write(void) +nmn4_write() { nmn4_write_data(); } diff --git a/osm.cc b/osm.cc index a0abe232b..42875cf7c 100644 --- a/osm.cc +++ b/osm.cc @@ -408,7 +408,7 @@ static osm_icon_mapping_t osm_icon_mappings[] = { /*-----------------------------------------------------------------------------*/ static void -osm_features_init(void) +osm_features_init() { int i; @@ -690,13 +690,13 @@ osm_rd_init(const QString& fname) } static void -osm_read(void) +osm_read() { xml_read(); } static void -osm_rd_deinit(void) +osm_rd_deinit() { xml_deinit(); waypoints.clear(); @@ -707,7 +707,7 @@ osm_rd_deinit(void) /*-----------------------------------------------------------------------------*/ static void -osm_init_icons(void) +osm_init_icons() { int i; @@ -937,7 +937,7 @@ osm_wr_init(const QString& fname) } static void -osm_write(void) +osm_write() { gbfprintf(fout, "\n"); gbfprintf(fout, "altitude); } -static void data_write(void) { +static void data_write() { gbfprintf(file_out, "H SOFTWARE NAME & VERSION\n" "I PCX5 2.09\n" diff --git a/pocketfms_bc.cc b/pocketfms_bc.cc index c263593cd..63d8c6189 100644 --- a/pocketfms_bc.cc +++ b/pocketfms_bc.cc @@ -60,7 +60,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -72,13 +72,13 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } static void -read_tracks(void) +read_tracks() { struct breadcrumb bc; route_head* trk_head = route_head_alloc(); @@ -163,13 +163,13 @@ pocketfms_waypt_disp(const Waypoint* wpt) } static void -data_read(void) +data_read() { read_tracks(); } static void -data_write(void) +data_write() { track_disp_all(route_head_noop, route_head_noop, pocketfms_waypt_disp); } diff --git a/pocketfms_fp.cc b/pocketfms_fp.cc index a31fe3b37..6a30f6c58 100644 --- a/pocketfms_fp.cc +++ b/pocketfms_fp.cc @@ -56,13 +56,13 @@ rd_init(const QString& fname) } static void -data_read(void) +data_read() { xml_read(); } static void -rd_deinit(void) +rd_deinit() { if (route != NULL) { Waypoint* head = (Waypoint*) QUEUE_FIRST(&route->waypoint_list); diff --git a/pocketfms_wp.cc b/pocketfms_wp.cc index 7a730ae12..dc6bccbe0 100644 --- a/pocketfms_wp.cc +++ b/pocketfms_wp.cc @@ -55,7 +55,7 @@ double wppos_to_dec(char* value) } static void -data_read(void) +data_read() { char* buff; int linecount = 0; @@ -90,7 +90,7 @@ data_read(void) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -124,13 +124,13 @@ enigma_waypt_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { waypt_disp_all(enigma_waypt_disp); } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } diff --git a/psitrex.cc b/psitrex.cc index 02cd7f258..358933bd3 100644 --- a/psitrex.cc +++ b/psitrex.cc @@ -185,7 +185,7 @@ psit_rd_init(const QString& fname) } static void -psit_rd_deinit(void) +psit_rd_deinit() { gbfclose(psit_file_in); } @@ -197,7 +197,7 @@ psit_wr_init(const QString& fname) } static void -psit_wr_deinit(void) +psit_wr_deinit() { gbfclose(psit_file_out); } @@ -695,7 +695,7 @@ psit_trackdatapoint_w_wrapper(const Waypoint* wpt) static void -psit_read(void) +psit_read() { Waypoint* wpt; route_head* rte; @@ -754,7 +754,7 @@ psit_noop(const route_head* wp) } void -psit_write(void) +psit_write() { int short_length; diff --git a/random.cc b/random.cc index ea0968716..1b4d96353 100644 --- a/random.cc +++ b/random.cc @@ -102,12 +102,12 @@ random_rd_init(const QString& fname) } static void -random_rd_deinit(void) +random_rd_deinit() { } static void -random_read(void) +random_read() { #define RND(a) (rand_int(a) > 0) diff --git a/raymarine.cc b/raymarine.cc index ebef78375..988ddab9c 100644 --- a/raymarine.cc +++ b/raymarine.cc @@ -176,13 +176,13 @@ raymarine_rd_init(const QString& fname) } static void -raymarine_rd_done(void) +raymarine_rd_done() { inifile_done(fin); } static void -raymarine_read(void) +raymarine_read() { Waypoint* wpt; unsigned int ix; @@ -435,7 +435,7 @@ enum_route_hdr_cb(const route_head* rte) } static short_handle -raymarine_new_short_handle(void) +raymarine_new_short_handle() { short_handle res; @@ -461,7 +461,7 @@ raymarine_wr_init(const QString& fname) } static void -raymarine_wr_done(void) +raymarine_wr_done() { mkshort_del_handle(&hshort_wpt); mkshort_del_handle(&hshort_rte); @@ -470,7 +470,7 @@ raymarine_wr_done(void) } static void -raymarine_write(void) +raymarine_write() { int i; Waypoint* wpt; diff --git a/route.cc b/route.cc index 799fb777f..a40845bca 100644 --- a/route.cc +++ b/route.cc @@ -32,40 +32,40 @@ static int trk_waypts; extern void update_common_traits(const Waypoint* wpt); void -route_init(void) +route_init() { QUEUE_INIT(&my_route_head); QUEUE_INIT(&my_track_head); } unsigned int -route_waypt_count(void) +route_waypt_count() { /* total wapoint count -- all routes */ return rte_waypts; } unsigned int -route_count(void) +route_count() { return rte_head_ct; /* total # of routes */ } unsigned int -track_waypt_count(void) +track_waypt_count() { /* totaly waypoint count -- all tracks */ return trk_waypts; } unsigned int -track_count(void) +track_count() { return trk_head_ct; /* total # of tracks */ } route_head* -route_head_alloc(void) +route_head_alloc() { route_head* rte_head = new route_head; return rte_head; @@ -352,7 +352,7 @@ route_flush_q(queue* head) } void -route_flush_all_routes(void) +route_flush_all_routes() { route_flush_q(&my_route_head); rte_head_ct = 0; @@ -360,7 +360,7 @@ route_flush_all_routes(void) } void -route_flush_all_tracks(void) +route_flush_all_tracks() { route_flush_q(&my_track_head); trk_head_ct = 0; @@ -475,7 +475,7 @@ track_restore_wpt(const Waypoint* wpt) } static void -common_restore_finish(void) +common_restore_finish() { rte_head_ct = 0; trk_head_ct = 0; @@ -524,7 +524,7 @@ track_restore(queue* head_bak) * at all to "fix" anything in the process. */ void -routes_to_tracks(void) +routes_to_tracks() { queue* elem, *tmp; @@ -539,7 +539,7 @@ routes_to_tracks(void) * Same, but in opposite direction. */ void -tracks_to_routes(void) +tracks_to_routes() { queue* elem, *tmp; diff --git a/saroute.cc b/saroute.cc index d2cfe5b1c..35052c841 100644 --- a/saroute.cc +++ b/saroute.cc @@ -107,13 +107,13 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(infile); } static void -my_read(void) +my_read() { uint16_t version; diff --git a/sbn.cc b/sbn.cc index 45fecec0a..477cbf57f 100644 --- a/sbn.cc +++ b/sbn.cc @@ -284,13 +284,13 @@ sbn_rd_init(const QString& fname) } static void -sbn_rd_deinit(void) +sbn_rd_deinit() { gbfclose(file_handle); } static void -sbn_read(void) +sbn_read() { if (global_opts.masked_objective & TRKDATAMASK) { route_head* track; @@ -305,7 +305,7 @@ sbn_read(void) } static void -sbn_exit(void) +sbn_exit() { } diff --git a/sbp.cc b/sbp.cc index c940b7144..6b6e14cff 100644 --- a/sbp.cc +++ b/sbp.cc @@ -43,7 +43,7 @@ sbp_rd_init(const QString& fname) } static void -sbp_rd_deinit(void) +sbp_rd_deinit() { gbfclose(file_handle); } @@ -83,7 +83,7 @@ read_sbp_header(route_head* track) } static Waypoint* -read_logpoint(void) +read_logpoint() { unsigned char buffer[SBP_RECORD_LEN]; @@ -95,7 +95,7 @@ read_logpoint(void) } static void -sbp_read(void) +sbp_read() { Waypoint* logpoint; route_head* track; @@ -111,7 +111,7 @@ sbp_read(void) } static void -sbp_exit(void) +sbp_exit() { } diff --git a/session.cc b/session.cc index b1511b1c8..bcdb3d24a 100644 --- a/session.cc +++ b/session.cc @@ -28,14 +28,14 @@ static int session_ct; static void session_free(session_t* s); void -session_init(void) +session_init() { QUEUE_INIT(&session_list); session_ct = 0; } void -session_exit(void) +session_exit() { queue* elem, *tmp; @@ -65,7 +65,7 @@ start_session(const char* name, const char* filename) } session_t* -curr_session(void) +curr_session() { return (session_t*) session_list.prev; } diff --git a/skyforce.cc b/skyforce.cc index b5433925f..fa1cd6c0f 100644 --- a/skyforce.cc +++ b/skyforce.cc @@ -243,14 +243,14 @@ skyforce_rd_init(const QString& fname) static void -skyforce_rd_deinit(void) +skyforce_rd_deinit() { gbfclose(fin); } static void -skyforce_read(void) +skyforce_read() { char* str; route_head* rte, *trk; @@ -337,7 +337,7 @@ skyforce_wr_init(const QString& fname) static void -skyforce_wr_deinit(void) +skyforce_wr_deinit() { mkshort_del_handle(&short_h); gbfclose(fout); @@ -345,7 +345,7 @@ skyforce_wr_deinit(void) static void -skyforce_write(void) +skyforce_write() { switch (global_opts.objective) { /* We can only write one data type at a time */ diff --git a/skytraq.cc b/skytraq.cc index ec7c959cc..df36d2994 100644 --- a/skytraq.cc +++ b/skytraq.cc @@ -148,7 +148,7 @@ db(int l, const char* msg, ...) } static void -rd_drain(void) +rd_drain() { if (gbser_flush(serial_handle)) { db(1, MYNAME ": rd_drain(): Comm error\n"); @@ -218,7 +218,7 @@ rd_buf(const uint8_t* buf, int len) } static unsigned int -rd_word(void) +rd_word() { int errors = 5; /* allow this many errors */ uint8_t buffer[2]; @@ -420,7 +420,7 @@ skytraq_wr_msg_verify(const uint8_t* payload, int len) } static int -skytraq_system_restart(void) +skytraq_system_restart() { uint8_t MSG_SYSTEM_RESTART[15] = { 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -486,7 +486,7 @@ skytraq_set_baud(int baud) } static int -skytraq_configure_logging(void) +skytraq_configure_logging() { // an0008-1.4.14: logs if // (dt > tmin & dd >= dmin & v >= vmin) | dt > tmax | dd > dmax | v > vmax @@ -1054,7 +1054,7 @@ skytraq_read_multiple_sectors(int first_sector, unsigned int sector_count, uint8 } static void -skytraq_read_tracks(void) +skytraq_read_tracks() { struct read_state st; uint32_t log_wr_ptr; @@ -1185,7 +1185,7 @@ skytraq_read_tracks(void) } static int -skytraq_probe(void) +skytraq_probe() { int baud_rates[] = { 9600, 230400, 115200, 57600, 4800, 19200, 38400 }; int baud_rates_count = sizeof(baud_rates)/sizeof(baud_rates[0]); @@ -1274,7 +1274,7 @@ skytraq_erase() } static void -skytraq_set_location(void) +skytraq_set_location() { double lat, lng; unsigned int i; @@ -1316,14 +1316,14 @@ skytraq_rd_init(const QString& fname) } static void -skytraq_rd_deinit(void) +skytraq_rd_deinit() { gbser_deinit(serial_handle); serial_handle = NULL; } static void -skytraq_read(void) +skytraq_read() { int dlbaud; @@ -1367,7 +1367,7 @@ file_init(const QString& fname) } static void -file_deinit(void) +file_deinit() { db(1, "Closing file...\n"); gbfclose(file_handle); @@ -1375,7 +1375,7 @@ file_deinit(void) } static void -file_read(void) +file_read() { struct read_state st; int rc, got_bytes; @@ -1623,14 +1623,14 @@ miniHomer_rd_init(const QString& fname) mhport=fname; } static void -miniHomer_rd_deinit(void) +miniHomer_rd_deinit() { skytraq_rd_deinit(); mhport.clear(); } #define SETPOI(poinum, poiname) if (opt_set_poi_##poiname ) {miniHomer_set_poi(poinum, opt_set_poi_##poiname);} static void -miniHomer_read(void) +miniHomer_read() { int npoi=0; /* diff --git a/smplrout.cc b/smplrout.cc index ef0659e24..576263194 100644 --- a/smplrout.cc +++ b/smplrout.cc @@ -373,7 +373,7 @@ routesimple_tail(const route_head* rte) } void -routesimple_process(void) +routesimple_process() { waypt_del_fnp = route_del_wpt; route_disp_all(routesimple_head, routesimple_tail, routesimple_waypt_pr); @@ -411,7 +411,7 @@ routesimple_init(const char* args) } void -routesimple_deinit(void) +routesimple_deinit() { /* do nothing */ } diff --git a/subrip.cc b/subrip.cc index 60e890212..4ad02d135 100644 --- a/subrip.cc +++ b/subrip.cc @@ -241,13 +241,13 @@ subrip_wr_init(const QString& fname) } static void -subrip_wr_deinit(void) +subrip_wr_deinit() { gbfclose(fout); } static void -subrip_write(void) +subrip_write() { track_disp_all(NULL, NULL, subrip_trkpt_pr); diff --git a/tef_xml.cc b/tef_xml.cc index 37dd85ba7..5a7790527 100644 --- a/tef_xml.cc +++ b/tef_xml.cc @@ -310,13 +310,13 @@ tef_xml_rd_init(const QString& fname) } static void -tef_xml_read(void) +tef_xml_read() { xml_read(); } static void -tef_xml_rd_deinit(void) +tef_xml_rd_deinit() { xml_deinit(); } diff --git a/teletype.cc b/teletype.cc index f25a26b08..4b1796a87 100644 --- a/teletype.cc +++ b/teletype.cc @@ -49,13 +49,13 @@ teletype_rd_init(const QString& fname) } static void -teletype_rd_deinit(void) +teletype_rd_deinit() { gbfclose(fin); } static void -teletype_read(void) +teletype_read() { uint32_t i; for (i = 0; i < tty_wpt_count; i++) { @@ -91,7 +91,7 @@ teletype_read(void) } static void -teletype_exit(void) /* optional */ +teletype_exit() /* optional */ { } diff --git a/text.cc b/text.cc index ab40eee17..0a408d77b 100644 --- a/text.cc +++ b/text.cc @@ -85,7 +85,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { if (!split_output) { gbfclose(file_out); @@ -259,7 +259,7 @@ text_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { if (! suppresssep && !split_output) { gbfprintf(file_out, "-----------------------------------------------------------------------------\n"); diff --git a/tiger.cc b/tiger.cc index 6d1e2d64e..fd60ea570 100644 --- a/tiger.cc +++ b/tiger.cc @@ -133,7 +133,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); mkshort_del_handle(&mkshort_handle); @@ -147,13 +147,13 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } static void -data_read(void) +data_read() { double lat,lon; char desc[101]; @@ -261,7 +261,7 @@ dscale(double distance) } static void -data_write(void) +data_write() { double latsz,lonsz; maxlat = -9999.0; diff --git a/tmpro.cc b/tmpro.cc index 083eb489d..c2ccbca52 100644 --- a/tmpro.cc +++ b/tmpro.cc @@ -49,7 +49,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -61,13 +61,13 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } static void -data_read(void) +data_read() { char* buff; char* s; @@ -229,7 +229,7 @@ tmpro_waypt_pr(const Waypoint* wpt) } static void -data_write(void) +data_write() { /* Short names */ if (global_opts.synthesize_shortnames) { diff --git a/tomtom.cc b/tomtom.cc index 2ddc4309b..9638610ea 100644 --- a/tomtom.cc +++ b/tomtom.cc @@ -60,7 +60,7 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(file_in); } @@ -72,7 +72,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); } @@ -148,7 +148,7 @@ check_recsize(int sz) } static void -data_read(void) +data_read() { int rectype; long recsize; @@ -422,7 +422,7 @@ free_blocks(struct blockheader* block) } static void -data_write(void) +data_write() { int ct = waypt_count(); struct hdr* htable, *bh; diff --git a/tools/cvslog b/tools/cvslog deleted file mode 100644 index 9ec5899a0..000000000 --- a/tools/cvslog +++ /dev/null @@ -1 +0,0 @@ -# cvs log -b -N -d '>2003-09-22' | less +date diff --git a/tpg.cc b/tpg.cc index 8e710ba7a..a20b8bd16 100644 --- a/tpg.cc +++ b/tpg.cc @@ -60,7 +60,7 @@ valid_tpg_header(char* header, int len) } static void -tpg_common_init(void) +tpg_common_init() { tpg_datum_idx = GPS_Lookup_Datum_Index(tpg_datum_opt); if (tpg_datum_idx < 0) { @@ -76,7 +76,7 @@ tpg_rd_init(const QString& fname) } static void -tpg_rd_deinit(void) +tpg_rd_deinit() { gbfclose(tpg_file_in); } @@ -91,14 +91,14 @@ tpg_wr_init(const QString& fname) } static void -tpg_wr_deinit(void) +tpg_wr_deinit() { mkshort_del_handle(&mkshort_handle); gbfclose(tpg_file_out); } static void -tpg_read(void) +tpg_read() { char buff[MAXTPGSTRINGSIZE + 1]; Waypoint* wpt_tmp; @@ -280,7 +280,7 @@ tpg_waypt_pr(const Waypoint* wpt) } static void -tpg_write(void) +tpg_write() { int s; unsigned char header_bytes[] = { 0xFF, 0xFF, 0x01, 0x00, 0x0D, diff --git a/tpo.cc b/tpo.cc index fb9927991..5198179c4 100644 --- a/tpo.cc +++ b/tpo.cc @@ -256,7 +256,7 @@ tpo_read_until_section(const char* section_name, int seek_bytes) // that is the only type of data available in the version 2.x TPO // files. // -void tpo_read_2_x(void) +void tpo_read_2_x() { char buff[16]; short track_count, waypoint_count; @@ -510,7 +510,7 @@ public: // Track decoder for version 3.x files. This block contains tracks // (called "freehand routes" or just "routes" in Topo). // -void tpo_process_tracks(void) +void tpo_process_tracks() { unsigned int track_count, track_style_count; unsigned int xx,ii,tmp; @@ -817,7 +817,7 @@ unsigned int tpo_index_ptr; // Waypoint decoder for version 3.x files. // -void tpo_process_waypoints(void) +void tpo_process_waypoints() { unsigned int waypoint_count; unsigned int ii; @@ -938,7 +938,7 @@ void tpo_process_waypoints(void) // Map Notes decoder for version 3.x files. // -void tpo_process_map_notes(void) +void tpo_process_map_notes() { unsigned int waypoint_count; unsigned int ii; @@ -1055,7 +1055,7 @@ void tpo_process_map_notes(void) // Symbols decoder for version 3.x files. // -void tpo_process_symbols(void) +void tpo_process_symbols() { unsigned int waypoint_count; unsigned int ii; @@ -1110,7 +1110,7 @@ void tpo_process_symbols(void) // Text Labels decoder for version 3.x files. // -void tpo_process_text_labels(void) +void tpo_process_text_labels() { unsigned int waypoint_count; unsigned int ii; @@ -1185,7 +1185,7 @@ void tpo_process_text_labels(void) // with pointers to waypoint objects by tpo_process_waypoints() // function above. // -void tpo_process_routes(void) +void tpo_process_routes() { unsigned int route_count; unsigned int ii; @@ -1282,7 +1282,7 @@ void tpo_process_routes(void) // Compass decoder for version 3.x files. // -void tpo_process_compass(void) +void tpo_process_compass() { // Not implemented yet @@ -1296,7 +1296,7 @@ void tpo_process_compass(void) // (called "freehand routes" or just "routes" in Topo), "waypoints", // and "gps-routes". We intend to read all three types. // -void tpo_read_3_x(void) +void tpo_read_3_x() { if (doing_trks) { @@ -1383,7 +1383,7 @@ tpo_rd_init(const QString& fname) } static void -tpo_rd_deinit(void) +tpo_rd_deinit() { unsigned int i; @@ -1403,7 +1403,7 @@ tpo_rd_deinit(void) } static void -tpo_read(void) +tpo_read() { if (tpo_version == 2.0) { @@ -1851,7 +1851,7 @@ tpo_wr_init(const QString& fname) } static void -tpo_wr_deinit(void) +tpo_wr_deinit() { /* the file footer is six bytes of zeroes */ unsigned char file_footer_bytes[6]; @@ -1862,7 +1862,7 @@ tpo_wr_deinit(void) } static void -tpo_write(void) +tpo_write() { unsigned char unknown1[] = { 0xFF, 0xFF, 0x01, 0x00 }; diff --git a/unicsv.cc b/unicsv.cc index 6312e9d27..30506b458 100644 --- a/unicsv.cc +++ b/unicsv.cc @@ -619,7 +619,7 @@ unicsv_rd_init(const QString& fname) } static void -unicsv_rd_deinit(void) +unicsv_rd_deinit() { gbfclose(fin); unicsv_fields_tab.clear(); @@ -1213,7 +1213,7 @@ unicsv_parse_one_line(char* ibuf) } static void -unicsv_rd(void) +unicsv_rd() { char* buff; @@ -1874,7 +1874,7 @@ unicsv_wr_init(const QString& filename) } static void -unicsv_wr_deinit(void) +unicsv_wr_deinit() { gbfclose(fout); } @@ -1894,7 +1894,7 @@ unicsv_check_modes(bool test) { static void -unicsv_wr(void) +unicsv_wr() { switch (global_opts.objective) { case wptdata: diff --git a/util.cc b/util.cc index 4e8fa6309..ea2083718 100644 --- a/util.cc +++ b/util.cc @@ -798,7 +798,7 @@ mklocaltime(struct tm* t) * reference files would be tedious, so we uphold that convention. */ gpsbabel::DateTime -current_time(void) +current_time() { if (getenv("GPSBABEL_FREEZE_TIME")) { return QDateTime::fromTime_t(0); diff --git a/v900.cc b/v900.cc index 888387d72..cb1e0bec6 100644 --- a/v900.cc +++ b/v900.cc @@ -173,7 +173,7 @@ v900_rd_init(const QString& fname) } static void -v900_rd_deinit(void) +v900_rd_deinit() { v900_log("%s\n",__func__); if (fin) { @@ -203,7 +203,7 @@ bintime2utc(int date, int time) { } static void -v900_read(void) +v900_read() { /* use line buffer large enough to hold either basic or advanced mode lines. */ union { diff --git a/vcf.cc b/vcf.cc index aecef6940..4832f8dfa 100644 --- a/vcf.cc +++ b/vcf.cc @@ -48,7 +48,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(file_out); mkshort_del_handle(&mkshort_handle); @@ -132,7 +132,7 @@ vcf_disp(const Waypoint* wpt) } static void -data_write(void) +data_write() { setshort_length(mkshort_handle, 6); waypt_disp_all(vcf_disp); diff --git a/vecs.cc b/vecs.cc index 1b739245c..4a7cf6ef1 100644 --- a/vecs.cc +++ b/vecs.cc @@ -1110,7 +1110,7 @@ vecs_t vec_list[] = { }; void -init_vecs(void) +init_vecs() { vecs_t* vec = vec_list; while (vec->vec) { @@ -1134,7 +1134,7 @@ is_integer(const char* c) } void -exit_vecs(void) +exit_vecs() { vecs_t* vec = vec_list; while (vec->vec) { @@ -1543,7 +1543,7 @@ sort_and_unify_vecs(int* ctp) #define VEC_FMT " %-20.20s %-.50s\n" void -disp_vecs(void) +disp_vecs() { vecs_t** svp; arglist_t* ap; diff --git a/vidaone.cc b/vidaone.cc index 72d7756bf..87b21978d 100644 --- a/vidaone.cc +++ b/vidaone.cc @@ -66,13 +66,13 @@ vidaone_rd_init(const QString& fname) } static void -vidaone_rd_deinit(void) +vidaone_rd_deinit() { gbfclose(fin); } static void -vidaone_read(void) +vidaone_read() { route_head* trk = NULL; @@ -108,7 +108,7 @@ vidaone_wr_init(const QString& fname) } static void -vidaone_wr_deinit(void) +vidaone_wr_deinit() { gbfclose(fout); } @@ -125,7 +125,7 @@ vidaone_trkpt(const Waypoint* wpt) } static void -vidaone_write(void) +vidaone_write() { track_disp_all(NULL, NULL, vidaone_trkpt); } diff --git a/vitosmt.cc b/vitosmt.cc index 61ea029d6..deea86fb3 100644 --- a/vitosmt.cc +++ b/vitosmt.cc @@ -60,13 +60,13 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(infile); } static void -vitosmt_read(void) +vitosmt_read() { long version =0; long subversion =0; @@ -227,7 +227,7 @@ wr_init(const QString& fname) } static void -wr_deinit(void) +wr_deinit() { gbfclose(ofs); @@ -313,7 +313,7 @@ vitosmt_waypt_pr(const Waypoint* waypointp) static void -vitosmt_write(void) +vitosmt_write() { unsigned char* workbuffer =0; size_t position =0; diff --git a/vitovtt.cc b/vitovtt.cc index 2a3b5ce96..0a2c1fd2a 100644 --- a/vitovtt.cc +++ b/vitovtt.cc @@ -49,13 +49,13 @@ rd_init(const QString& fname) } static void -rd_deinit(void) +rd_deinit() { gbfclose(infile); } static void -vitovtt_read(void) +vitovtt_read() { int version = 0; route_head* route_head = 0; diff --git a/vpl.cc b/vpl.cc index 3db5cb9f1..49238f2a1 100644 --- a/vpl.cc +++ b/vpl.cc @@ -132,13 +132,13 @@ vpl_rd_init(const QString& fname) } static void -vpl_rd_deinit(void) +vpl_rd_deinit() { gbfclose(vpl_file_in); } static void -vpl_read(void) +vpl_read() { char* ibuf; diff --git a/waypt.cc b/waypt.cc index 86a2f12a3..083adc568 100644 --- a/waypt.cc +++ b/waypt.cc @@ -43,13 +43,13 @@ static short_handle mkshort_handle; geocache_data Waypoint::empty_gc_data; static global_trait traits; -const global_trait* get_traits(void) +const global_trait* get_traits() { return &traits; } void -waypt_init(void) +waypt_init() { mkshort_handle = mkshort_new_handle(); #if NEWQ @@ -154,7 +154,7 @@ waypt_del(Waypoint* wpt) } unsigned int -waypt_count(void) +waypt_count() { #if NEWQ return waypt_list.size(); diff --git a/wbt-200.cc b/wbt-200.cc index 19ea0f9ed..b0d8f97ce 100644 --- a/wbt-200.cc +++ b/wbt-200.cc @@ -407,7 +407,7 @@ static void rd_init(const QString& fname) } } -static void rd_deinit(void) +static void rd_deinit() { db(1, "Closing port...\n"); gbser_deinit(fd); @@ -435,7 +435,7 @@ static void file_init(const QString& fname) } } -static void file_deinit(void) +static void file_deinit() { db(1, "Closing file...\n"); fclose(fl); @@ -705,7 +705,7 @@ static int want_bytes(struct buf_head* h, size_t len) return 1; } -static void wbt200_data_read(void) +static void wbt200_data_read() { /* Awooga! Awooga! Statically allocated buffer danger! * Actually, it's OK because rd_line can read arbitrarily @@ -926,7 +926,7 @@ static int wbt201_read_chunk(struct read_state* st, unsigned pos, unsigned limit } -static void wbt201_data_read(void) +static void wbt201_data_read() { char line_buf[100]; struct read_state st; @@ -1011,7 +1011,7 @@ static void wbt201_data_read(void) do_simple("@AL,2,1", BUFSPEC(line_buf)); } -static void file_read(void) +static void file_read() { char buf[512]; size_t rc; @@ -1069,7 +1069,7 @@ static void file_read(void) state_empty(&st); } -static void data_read(void) +static void data_read() { switch (dev_type) { case WBT200: diff --git a/wfff_xml.cc b/wfff_xml.cc index d010c0e15..2916746e8 100644 --- a/wfff_xml.cc +++ b/wfff_xml.cc @@ -208,13 +208,13 @@ wfff_xml_rd_init(const QString& fname) } void -wfff_xml_read(void) +wfff_xml_read() { xml_read(); } void -wfff_xml_rd_deinit(void) +wfff_xml_rd_deinit() { xml_deinit(); diff --git a/wintec_tes.cc b/wintec_tes.cc index 8b6ffe021..303e38532 100644 --- a/wintec_tes.cc +++ b/wintec_tes.cc @@ -33,7 +33,7 @@ wintec_tes_rd_init(const QString& fname) } static void -wintec_tes_rd_deinit(void) +wintec_tes_rd_deinit() { gbfclose(fin); } @@ -54,7 +54,7 @@ wintec_date_to_time(uint32_t w) } static void -wintec_tes_read(void) +wintec_tes_read() { route_head* trk = route_head_alloc(); track_add_head(trk); diff --git a/xmlgeneric.cc b/xmlgeneric.cc index 570bb9ddd..ebb1b1cbe 100644 --- a/xmlgeneric.cc +++ b/xmlgeneric.cc @@ -84,7 +84,7 @@ xml_init(const QString& fname, xg_tag_mapping* tbl, const char* encoding) } void -xml_deinit(void) +xml_deinit() { reader_data.clear(); rd_fname.clear(); @@ -172,7 +172,7 @@ readnext: } } -void xml_read(void) +void xml_read() { gpsbabel::File file(rd_fname); QString current_tag; diff --git a/xol.cc b/xol.cc index 68afca685..f9cc0840b 100644 --- a/xol.cc +++ b/xol.cc @@ -138,9 +138,9 @@ static void xol_rd_init(const QString& fname) { xml_init(fname, xol_map, NULL); } -static void xol_read(void) { xml_read(); } +static void xol_read() { xml_read(); } -static void xol_rd_deinit(void) { xml_deinit(); } +static void xol_rd_deinit() { xml_deinit(); } /* writer */ @@ -175,7 +175,7 @@ static void xol_wr_init(const QString& fname) { setshort_defname(short_h, "Waypoint"); } -static void xol_wr_deinit(void) { +static void xol_wr_deinit() { mkshort_del_handle(&short_h); writer->writeEndDocument(); delete writer; @@ -259,7 +259,7 @@ static void xol_trkpt_disp_cb(const Waypoint* wpt) { writer->writeEndElement(); // shape } -static void xol_write(void) { +static void xol_write() { double x, y; waypt_disp_all(xol_waypt_bound_calc); diff --git a/yahoo.cc b/yahoo.cc index b7cda7311..3405b54e7 100644 --- a/yahoo.cc +++ b/yahoo.cc @@ -61,13 +61,13 @@ yahoo_rd_init(const QString& fname) } static void -yahoo_read(void) +yahoo_read() { xml_read(); } static void -yahoo_rd_deinit(void) +yahoo_rd_deinit() { xml_deinit(); } -- 2.30.2